From 02fe45bca289a31f076570e89294c3ba926bb141 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 31 Jan 2017 23:32:56 +0100 Subject: [PATCH] Rename mod: default to mcl_core --- mods/beds/depends.txt | 2 +- mods/beds/init.lua | 4 +- mods/bookex/depends.txt | 2 +- mods/bookex/init.lua | 10 +- mods/bucket/depends.txt | 3 +- mods/bucket/init.lua | 12 +- mods/builtin_item/init.lua | 4 +- mods/craftingpack/crafting/creative.lua | 12 +- mods/craftingpack/crafting/depends.txt | 2 +- mods/craftingpack/crafting/init.lua | 6 +- mods/craftingpack/inventory_plus/depends.txt | 2 - mods/default/crafting.lua | 1058 ----------------- mods/default/init.lua | 29 - mods/doors/depends.txt | 2 +- mods/doors/init.lua | 68 +- mods/drippingwater/depends.txt | 3 +- mods/gemalde/depends.txt | 2 +- mods/gemalde/init.lua | 6 +- mods/hardened_clay/depends.txt | 2 +- mods/hardened_clay/init.lua | 6 +- mods/hbhunger/depends.txt | 2 +- mods/itemframes/depends.txt | 2 +- mods/itemframes/init.lua | 8 +- mods/mcl_boats/depends.txt | 2 +- mods/mcl_boats/init.lua | 2 +- mods/mcl_cake/depends.txt | 2 +- mods/mcl_cake/init.lua | 14 +- mods/mcl_chests/depends.txt | 2 +- mods/mcl_chests/init.lua | 22 +- mods/mcl_clock/depends.txt | 2 +- mods/mcl_clock/init.lua | 6 +- mods/mcl_compass/depends.txt | 2 +- mods/mcl_compass/init.lua | 6 +- mods/{default => mcl_core}/README.txt | 0 mods/mcl_core/crafting.lua | 1058 +++++++++++++++++ mods/{default => mcl_core}/craftitems.lua | 56 +- mods/{default => mcl_core}/functions.lua | 195 ++- mods/mcl_core/init.lua | 29 + mods/{default => mcl_core}/mapgen.lua | 230 ++-- mods/mcl_core/mod.conf | 1 + .../models/character.blend | Bin .../models/character.png | Bin mods/{default => mcl_core}/models/character.x | 0 mods/{default => mcl_core}/nodes.lua | 542 ++++----- mods/{default => mcl_core}/player.lua | 40 +- .../sounds/default_break_glass.1.ogg | Bin .../sounds/default_break_glass.2.ogg | Bin .../sounds/default_break_glass.3.ogg | Bin .../sounds/default_cool_lava.1.ogg | Bin .../sounds/default_cool_lava.2.ogg | Bin .../sounds/default_cool_lava.3.ogg | Bin .../sounds/default_dig_choppy.ogg | Bin .../sounds/default_dig_cracky.ogg | Bin .../sounds/default_dig_crumbly.ogg | Bin .../sounds/default_dig_dig_immediate.ogg | Bin .../default_dig_oddly_breakable_by_hand.ogg | Bin .../sounds/default_dirt_footstep.1.ogg | Bin .../sounds/default_dirt_footstep.2.ogg | Bin .../sounds/default_dug_node.1.ogg | Bin .../sounds/default_dug_node.2.ogg | Bin .../sounds/default_glass_footstep.ogg | Bin .../sounds/default_grass_footstep.1.ogg | Bin .../sounds/default_grass_footstep.2.ogg | Bin .../sounds/default_grass_footstep.3.ogg | Bin .../sounds/default_gravel_footstep.1.ogg | Bin .../sounds/default_gravel_footstep.2.ogg | Bin .../sounds/default_gravel_footstep.3.ogg | Bin .../sounds/default_gravel_footstep.4.ogg | Bin .../sounds/default_hard_footstep.1.ogg | Bin .../sounds/default_hard_footstep.2.ogg | Bin .../sounds/default_hard_footstep.3.ogg | Bin .../sounds/default_place_node.1.ogg | Bin .../sounds/default_place_node.2.ogg | Bin .../sounds/default_place_node.3.ogg | Bin .../sounds/default_place_node_hard.1.ogg | Bin .../sounds/default_place_node_hard.2.ogg | Bin .../sounds/default_sand_footstep.1.ogg | Bin .../sounds/default_sand_footstep.2.ogg | Bin .../sounds/default_snow_footstep.1.ogg | Bin .../sounds/default_snow_footstep.2.ogg | Bin .../sounds/default_snow_footstep.3.ogg | Bin .../sounds/default_tool_break.ogg | Bin .../sounds/default_wood_footstep.1.ogg | Bin .../sounds/default_wood_footstep.2.ogg | Bin .../{default => mcl_core}/textures/bubble.png | Bin .../textures/crack_anylength.png | Bin .../textures/crafting_inventory_furnace.png | Bin .../crafting_inventory_furnace_on.png | Bin .../textures/crosshair.png | Bin .../textures/default_acacialeaves.png | Bin .../textures/default_acaciasapling.png | Bin .../textures/default_acaciatree.png | Bin .../textures/default_acaciatree_top.png | Bin .../textures/default_acaciawood.png | Bin .../textures/default_andesite.png | Bin .../textures/default_andesite_smooth.png | Bin .../textures/default_apple.png | Bin .../textures/default_apple_gold.png | Bin .../textures/default_barrier.png | Bin .../textures/default_bedrock.png | Bin .../textures/default_bone.png | Bin .../textures/default_book.png | Bin .../textures/default_bookshelf.png | Bin .../textures/default_bowl.png | Bin .../textures/default_brick.png | Bin .../textures/default_cactus_bottom.png | Bin .../textures/default_cactus_side.png | Bin .../textures/default_cactus_top.png | Bin .../textures/default_charcoal_lump.png | Bin .../textures/default_clay.png | Bin .../textures/default_clay_brick.png | Bin .../textures/default_clay_lump.png | Bin .../textures/default_coal_block.png | Bin .../textures/default_coal_lump.png | Bin .../textures/default_coarse_dirt.png | Bin .../textures/default_cobble.png | Bin .../textures/default_diamond.png | Bin .../textures/default_diamond_block.png | Bin .../textures/default_diorite.png | Bin .../textures/default_diorite_smooth.png | Bin .../textures/default_dirt.png | Bin .../textures/default_dirt_podzol_side.png | Bin .../textures/default_dirt_podzol_top.png | Bin .../textures/default_dry_shrub.png | Bin .../textures/default_emerald.png | Bin .../textures/default_emerald_block.png | Bin .../textures/default_fire_particle1.png | Bin .../textures/default_fire_particle2.png | Bin .../textures/default_fish.png | Bin .../textures/default_fish_cooked.png | Bin .../textures/default_flint.png | Bin .../textures/default_frosted_ice_0.png | Bin .../textures/default_frosted_ice_1.png | Bin .../textures/default_frosted_ice_2.png | Bin .../textures/default_frosted_ice_3.png | Bin .../textures/default_glass.png | Bin .../textures/default_glowstone.png | Bin .../textures/default_glowstone_dust.png | Bin .../textures/default_gold_block.png | Bin .../textures/default_gold_ingot.png | Bin .../textures/default_gold_nugget.png | Bin .../textures/default_granite.png | Bin .../textures/default_granite_smooth.png | Bin .../textures/default_grass.png | Bin .../textures/default_grass_side.png | Bin .../textures/default_gravel.png | Bin .../textures/default_gunpowder.png | Bin .../textures/default_hayblock_side.png | Bin .../textures/default_hayblock_top.png | Bin .../textures/default_ice.png | Bin .../textures/default_ice_packed.png | Bin .../textures/default_iron_nugget.png | Bin .../textures/default_junglegrass.png | Bin .../textures/default_jungleleaves.png | Bin .../textures/default_junglesapling.png | Bin .../textures/default_jungletree.png | Bin .../textures/default_jungletree_top.png | Bin .../textures/default_junglewood.png | Bin .../textures/default_ladder.png | Bin .../textures/default_lapis_block.png | Bin .../textures/default_large_chest_bg.png | Bin .../textures/default_lava.png | Bin .../default_lava_flowing_animated.png | Bin .../textures/default_lava_source_animated.png | Bin .../textures/default_leaves.png | Bin .../textures/default_leaves_big_oak.png | Bin .../textures/default_leaves_birch.png | Bin .../textures/default_log_big_oak.png | Bin .../textures/default_log_big_oak_top.png | Bin .../textures/default_log_birch.png | Bin .../textures/default_log_birch_top.png | Bin .../textures/default_mineral_coal.png | Bin .../textures/default_mineral_diamond.png | Bin .../textures/default_mineral_emerald.png | Bin .../textures/default_mineral_gold.png | Bin .../textures/default_mineral_iron.png | Bin .../textures/default_mineral_lapis.png | Bin .../textures/default_mineral_redstone.png | Bin .../textures/default_mossycobble.png | Bin .../textures/default_mycelium_side.png | Bin .../textures/default_mycelium_top.png | Bin .../textures/default_obsidian.png | Bin .../textures/default_paper.png | Bin .../textures/default_papyrus.png | Bin .../textures/default_planks_big_oak.png | Bin .../textures/default_planks_birch.png | Bin .../textures/default_prismarine_anim.png | Bin .../textures/default_prismarine_bricks.png | Bin .../textures/default_prismarine_crystals.png | Bin .../textures/default_prismarine_dark.png | Bin .../textures/default_prismarine_shard.png | Bin .../textures/default_quartz_block_bottom.png | Bin .../textures/default_quartz_block_side.png | Bin .../textures/default_quartz_block_top.png | Bin .../textures/default_quartz_chiseled_side.png | Bin .../textures/default_quartz_chiseled_top.png | Bin .../textures/default_quartz_crystal.png | Bin .../textures/default_quartz_ore.png | Bin .../textures/default_quartz_pillar_side.png | Bin .../textures/default_quartz_pillar_top.png | Bin .../textures/default_rail.png | Bin .../textures/default_rail_crossing.png | Bin .../textures/default_rail_curved.png | Bin .../textures/default_rail_t_junction.png | Bin .../textures/default_red_sand.png | Bin .../textures/default_redsandstone_bottom.png | Bin .../textures/default_redsandstone_carved.png | Bin .../textures/default_redsandstone_normal.png | Bin .../textures/default_redsandstone_smooth.png | Bin .../textures/default_redsandstone_top.png | Bin .../textures/default_redstone_block.png | Bin .../textures/default_sand.png | Bin .../textures/default_sandstone_bottom.png | Bin .../textures/default_sandstone_carved.png | Bin .../textures/default_sandstone_normal.png | Bin .../textures/default_sandstone_smooth.png | Bin .../textures/default_sandstone_top.png | Bin .../textures/default_sapling.png | Bin .../textures/default_sapling_big_oak.png | Bin .../textures/default_sapling_birch.png | Bin .../textures/default_sea_lantern.png | Bin .../textures/default_sign.png | Bin .../textures/default_sign_wall.png | Bin .../textures/default_slimeblock.png | Bin .../textures/default_snow.png | Bin .../textures/default_sponge.png | Bin .../textures/default_sponge_wet.png | Bin .../textures/default_spruceleaves.png | Bin .../textures/default_sprucesapling.png | Bin .../textures/default_sprucetree.png | Bin .../textures/default_sprucetree_top.png | Bin .../textures/default_sprucewood.png | Bin .../textures/default_steel_block.png | Bin .../textures/default_steel_ingot.png | Bin .../textures/default_stick.png | Bin .../textures/default_stone.png | Bin .../textures/default_stone_brick.png | Bin .../textures/default_stonebrick_carved.png | Bin .../textures/default_stonebrick_cracked.png | Bin .../textures/default_stonebrick_mossy.png | Bin .../textures/default_string.png | Bin .../textures/default_sugar.png | Bin .../textures/default_sugar_cane.png | Bin .../textures/default_sulphur.png | Bin .../textures/default_tallgrass.png | Bin .../textures/default_tnt_bottom.png | Bin .../textures/default_tnt_side.png | Bin .../textures/default_tnt_top.png | Bin .../textures/default_tool_diamondaxe.png | Bin .../textures/default_tool_diamondpick.png | Bin .../textures/default_tool_diamondshovel.png | Bin .../textures/default_tool_diamondsword.png | Bin .../textures/default_tool_fishing_pole.png | Bin .../textures/default_tool_flint_and_steel.png | Bin .../textures/default_tool_goldaxe.png | Bin .../textures/default_tool_goldpick.png | Bin .../textures/default_tool_goldshovel.png | Bin .../textures/default_tool_goldsword.png | Bin .../textures/default_tool_shears.png | Bin .../textures/default_tool_steelaxe.png | Bin .../textures/default_tool_steelpick.png | Bin .../textures/default_tool_steelshovel.png | Bin .../textures/default_tool_steelsword.png | Bin .../textures/default_tool_stoneaxe.png | Bin .../textures/default_tool_stonepick.png | Bin .../textures/default_tool_stoneshovel.png | Bin .../textures/default_tool_stonesword.png | Bin .../textures/default_tool_woodaxe.png | Bin .../textures/default_tool_woodpick.png | Bin .../textures/default_tool_woodshovel.png | Bin .../textures/default_tool_woodsword.png | Bin .../textures/default_torch.png | Bin .../textures/default_torch_animated.png | Bin .../textures/default_torch_on_ceiling.png | Bin .../default_torch_on_ceiling_animated.png | Bin .../textures/default_torch_on_floor.png | Bin .../default_torch_on_floor_animated.png | Bin .../textures/default_tree.png | Bin .../textures/default_tree_top.png | Bin .../textures/default_vine.png | Bin .../textures/default_water.png | Bin .../default_water_flowing_animated.png | Bin .../default_water_source_animated.png | Bin .../textures/default_wood.png | Bin .../textures/door_wood.png | Bin .../textures/door_wood_a.png | Bin .../textures/door_wood_a_r.png | Bin .../textures/door_wood_b.png | Bin .../textures/door_wood_b_r.png | Bin .../textures/fishing_pole.png | Bin mods/{default => mcl_core}/textures/heart.png | Bin mods/{default => mcl_core}/textures/moon.png | Bin .../{default => mcl_core}/textures/player.png | Bin .../textures/player_back.png | Bin mods/{default => mcl_core}/textures/sun.png | Bin .../textures/treeprop.png | Bin mods/{default => mcl_core}/textures/web.png | Bin .../textures/wieldhand.png | Bin mods/{default => mcl_core}/tools.lua | 80 +- mods/mcl_dye/depends.txt | 1 + mods/mcl_dye/init.lua | 8 +- mods/mcl_end/depends.txt | 2 +- mods/mcl_end/init.lua | 12 +- mods/mcl_farming/carrots.lua | 14 +- mods/mcl_farming/depends.txt | 3 +- mods/mcl_farming/hoes.lua | 62 +- mods/mcl_farming/melon.lua | 22 +- mods/mcl_farming/mushrooms.lua | 8 +- mods/mcl_farming/potatoes.lua | 6 +- mods/mcl_farming/pumpkin.lua | 28 +- mods/mcl_farming/soil.lua | 10 +- mods/mcl_farming/wheat.lua | 8 +- mods/mcl_fences/depends.txt | 2 +- mods/mcl_fences/init.lua | 22 +- mods/mcl_flowers/depends.txt | 2 +- mods/mcl_flowers/init.lua | 30 +- mods/mcl_flowers/mapgen.lua | 25 +- mods/mcl_furnaces/depends.txt | 2 +- mods/mcl_furnaces/init.lua | 14 +- mods/mcl_heads/depends.txt | 2 +- mods/mcl_heads/init.lua | 2 +- mods/mcl_hoppers/depends.txt | 2 +- mods/mcl_hoppers/init.lua | 14 +- mods/mcl_jukebox/depends.txt | 2 +- mods/mcl_jukebox/init.lua | 4 +- mods/mcl_minecarts/depends.txt | 2 +- mods/mcl_minecarts/rails.lua | 6 +- mods/mcl_mobitems/depends.txt | 1 + mods/mcl_mobitems/init.lua | 2 +- mods/mcl_potions/depends.txt | 2 +- mods/mcl_potions/init.lua | 12 +- mods/mcl_throwing/arrow.lua | 4 +- mods/mcl_throwing/depends.txt | 2 +- mods/mcl_throwing/init.lua | 12 +- mods/mcl_tnt/depends.txt | 2 +- mods/mcl_tnt/init.lua | 12 +- mods/mcl_walls/depends.txt | 2 +- mods/mcl_walls/init.lua | 16 +- mods/mcl_wool/depends.txt | 2 +- mods/mcl_wool/init.lua | 4 +- mods/mcstair/depends.txt | 3 +- mods/mcstair/init.lua | 2 +- mods/minetest-3d_armor/3d_armor/armor.lua | 22 +- mods/minetest-3d_armor/3d_armor/depends.txt | 2 +- mods/minetest-3d_armor/3d_armor/init.lua | 8 +- .../3d_armor_stand/depends.txt | 2 +- .../minetest-3d_armor/3d_armor_stand/init.lua | 8 +- .../unified_skins/depends.txt | 2 +- mods/minetest-3d_armor/wieldview/depends.txt | 2 +- .../minetest-3d_armor/wieldview/transform.lua | 4 +- mods/mobs/api.lua | 22 +- mods/mobs/depends.txt | 2 +- mods/mobs/spawner.lua | 2 +- mods/mobs_mc/chicken.lua | 2 +- mods/mobs_mc/cow.lua | 4 +- mods/mobs_mc/creeper.lua | 2 +- mods/mobs_mc/depends.txt | 2 +- mods/mobs_mc/enderman.lua | 4 +- mods/mobs_mc/ghast.lua | 4 +- mods/mobs_mc/horse.lua | 6 +- mods/mobs_mc/pig.lua | 4 +- mods/mobs_mc/sheep.lua | 2 +- mods/mobs_mc/skeleton.lua | 6 +- mods/mobs_mc/slimes.lua | 10 +- mods/mobs_mc/spider.lua | 6 +- mods/mobs_mc/villager.lua | 68 +- mods/mobs_mc/wolf.lua | 2 +- mods/mobs_mc/zombie.lua | 6 +- mods/mobs_mc/zombiepig.lua | 10 +- mods/playerplus/depends.txt | 2 +- mods/playerplus/init.lua | 2 +- mods/redstone/mesecons/depends.txt | 2 +- mods/redstone/mesecons/wires.lua | 6 +- mods/redstone/mesecons_button/init.lua | 10 +- mods/redstone/mesecons_commandblock/init.lua | 4 +- mods/redstone/mesecons_delayer/init.lua | 4 +- mods/redstone/mesecons_lightstone/init.lua | 6 +- mods/redstone/mesecons_materials/depends.txt | 2 +- mods/redstone/mesecons_materials/init.lua | 6 +- mods/redstone/mesecons_mvps/init.lua | 8 +- mods/redstone/mesecons_noteblock/init.lua | 12 +- mods/redstone/mesecons_pistons/init.lua | 26 +- .../redstone/mesecons_pressureplates/init.lua | 6 +- mods/redstone/mesecons_solarpanel/init.lua | 12 +- mods/redstone/mesecons_torch/init.lua | 4 +- mods/redstone/mesecons_walllever/init.lua | 8 +- mods/signs/depends.txt | 2 +- mods/stairs/depends.txt | 2 +- mods/stairs/init.lua | 76 +- mods/torches/depends.txt | 2 +- mods/torches/init.lua | 24 +- mods/xpanes/depends.txt | 2 +- mods/xpanes/init.lua | 42 +- 393 files changed, 2205 insertions(+), 2210 deletions(-) delete mode 100644 mods/craftingpack/inventory_plus/depends.txt delete mode 100644 mods/default/crafting.lua delete mode 100644 mods/default/init.lua rename mods/{default => mcl_core}/README.txt (100%) create mode 100644 mods/mcl_core/crafting.lua rename mods/{default => mcl_core}/craftitems.lua (71%) rename mods/{default => mcl_core}/functions.lua (78%) create mode 100644 mods/mcl_core/init.lua rename mods/{default => mcl_core}/mapgen.lua (61%) create mode 100644 mods/mcl_core/mod.conf rename mods/{default => mcl_core}/models/character.blend (100%) rename mods/{default => mcl_core}/models/character.png (100%) rename mods/{default => mcl_core}/models/character.x (100%) rename mods/{default => mcl_core}/nodes.lua (73%) rename mods/{default => mcl_core}/player.lua (83%) rename mods/{default => mcl_core}/sounds/default_break_glass.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_break_glass.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_break_glass.3.ogg (100%) rename mods/{default => mcl_core}/sounds/default_cool_lava.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_cool_lava.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_cool_lava.3.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dig_choppy.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dig_cracky.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dig_crumbly.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dig_dig_immediate.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dig_oddly_breakable_by_hand.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dirt_footstep.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dirt_footstep.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dug_node.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_dug_node.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_glass_footstep.ogg (100%) rename mods/{default => mcl_core}/sounds/default_grass_footstep.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_grass_footstep.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_grass_footstep.3.ogg (100%) rename mods/{default => mcl_core}/sounds/default_gravel_footstep.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_gravel_footstep.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_gravel_footstep.3.ogg (100%) rename mods/{default => mcl_core}/sounds/default_gravel_footstep.4.ogg (100%) rename mods/{default => mcl_core}/sounds/default_hard_footstep.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_hard_footstep.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_hard_footstep.3.ogg (100%) rename mods/{default => mcl_core}/sounds/default_place_node.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_place_node.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_place_node.3.ogg (100%) rename mods/{default => mcl_core}/sounds/default_place_node_hard.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_place_node_hard.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_sand_footstep.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_sand_footstep.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_snow_footstep.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_snow_footstep.2.ogg (100%) rename mods/{default => mcl_core}/sounds/default_snow_footstep.3.ogg (100%) rename mods/{default => mcl_core}/sounds/default_tool_break.ogg (100%) rename mods/{default => mcl_core}/sounds/default_wood_footstep.1.ogg (100%) rename mods/{default => mcl_core}/sounds/default_wood_footstep.2.ogg (100%) rename mods/{default => mcl_core}/textures/bubble.png (100%) rename mods/{default => mcl_core}/textures/crack_anylength.png (100%) rename mods/{default => mcl_core}/textures/crafting_inventory_furnace.png (100%) rename mods/{default => mcl_core}/textures/crafting_inventory_furnace_on.png (100%) rename mods/{default => mcl_core}/textures/crosshair.png (100%) rename mods/{default => mcl_core}/textures/default_acacialeaves.png (100%) rename mods/{default => mcl_core}/textures/default_acaciasapling.png (100%) rename mods/{default => mcl_core}/textures/default_acaciatree.png (100%) rename mods/{default => mcl_core}/textures/default_acaciatree_top.png (100%) rename mods/{default => mcl_core}/textures/default_acaciawood.png (100%) rename mods/{default => mcl_core}/textures/default_andesite.png (100%) rename mods/{default => mcl_core}/textures/default_andesite_smooth.png (100%) rename mods/{default => mcl_core}/textures/default_apple.png (100%) rename mods/{default => mcl_core}/textures/default_apple_gold.png (100%) rename mods/{default => mcl_core}/textures/default_barrier.png (100%) rename mods/{default => mcl_core}/textures/default_bedrock.png (100%) rename mods/{default => mcl_core}/textures/default_bone.png (100%) rename mods/{default => mcl_core}/textures/default_book.png (100%) rename mods/{default => mcl_core}/textures/default_bookshelf.png (100%) rename mods/{default => mcl_core}/textures/default_bowl.png (100%) rename mods/{default => mcl_core}/textures/default_brick.png (100%) rename mods/{default => mcl_core}/textures/default_cactus_bottom.png (100%) rename mods/{default => mcl_core}/textures/default_cactus_side.png (100%) rename mods/{default => mcl_core}/textures/default_cactus_top.png (100%) rename mods/{default => mcl_core}/textures/default_charcoal_lump.png (100%) rename mods/{default => mcl_core}/textures/default_clay.png (100%) rename mods/{default => mcl_core}/textures/default_clay_brick.png (100%) rename mods/{default => mcl_core}/textures/default_clay_lump.png (100%) rename mods/{default => mcl_core}/textures/default_coal_block.png (100%) rename mods/{default => mcl_core}/textures/default_coal_lump.png (100%) rename mods/{default => mcl_core}/textures/default_coarse_dirt.png (100%) rename mods/{default => mcl_core}/textures/default_cobble.png (100%) rename mods/{default => mcl_core}/textures/default_diamond.png (100%) rename mods/{default => mcl_core}/textures/default_diamond_block.png (100%) rename mods/{default => mcl_core}/textures/default_diorite.png (100%) rename mods/{default => mcl_core}/textures/default_diorite_smooth.png (100%) rename mods/{default => mcl_core}/textures/default_dirt.png (100%) rename mods/{default => mcl_core}/textures/default_dirt_podzol_side.png (100%) rename mods/{default => mcl_core}/textures/default_dirt_podzol_top.png (100%) rename mods/{default => mcl_core}/textures/default_dry_shrub.png (100%) rename mods/{default => mcl_core}/textures/default_emerald.png (100%) rename mods/{default => mcl_core}/textures/default_emerald_block.png (100%) rename mods/{default => mcl_core}/textures/default_fire_particle1.png (100%) rename mods/{default => mcl_core}/textures/default_fire_particle2.png (100%) rename mods/{default => mcl_core}/textures/default_fish.png (100%) rename mods/{default => mcl_core}/textures/default_fish_cooked.png (100%) rename mods/{default => mcl_core}/textures/default_flint.png (100%) rename mods/{default => mcl_core}/textures/default_frosted_ice_0.png (100%) rename mods/{default => mcl_core}/textures/default_frosted_ice_1.png (100%) rename mods/{default => mcl_core}/textures/default_frosted_ice_2.png (100%) rename mods/{default => mcl_core}/textures/default_frosted_ice_3.png (100%) rename mods/{default => mcl_core}/textures/default_glass.png (100%) rename mods/{default => mcl_core}/textures/default_glowstone.png (100%) rename mods/{default => mcl_core}/textures/default_glowstone_dust.png (100%) rename mods/{default => mcl_core}/textures/default_gold_block.png (100%) rename mods/{default => mcl_core}/textures/default_gold_ingot.png (100%) rename mods/{default => mcl_core}/textures/default_gold_nugget.png (100%) rename mods/{default => mcl_core}/textures/default_granite.png (100%) rename mods/{default => mcl_core}/textures/default_granite_smooth.png (100%) rename mods/{default => mcl_core}/textures/default_grass.png (100%) rename mods/{default => mcl_core}/textures/default_grass_side.png (100%) rename mods/{default => mcl_core}/textures/default_gravel.png (100%) rename mods/{default => mcl_core}/textures/default_gunpowder.png (100%) rename mods/{default => mcl_core}/textures/default_hayblock_side.png (100%) rename mods/{default => mcl_core}/textures/default_hayblock_top.png (100%) rename mods/{default => mcl_core}/textures/default_ice.png (100%) rename mods/{default => mcl_core}/textures/default_ice_packed.png (100%) rename mods/{default => mcl_core}/textures/default_iron_nugget.png (100%) rename mods/{default => mcl_core}/textures/default_junglegrass.png (100%) rename mods/{default => mcl_core}/textures/default_jungleleaves.png (100%) rename mods/{default => mcl_core}/textures/default_junglesapling.png (100%) rename mods/{default => mcl_core}/textures/default_jungletree.png (100%) rename mods/{default => mcl_core}/textures/default_jungletree_top.png (100%) rename mods/{default => mcl_core}/textures/default_junglewood.png (100%) rename mods/{default => mcl_core}/textures/default_ladder.png (100%) rename mods/{default => mcl_core}/textures/default_lapis_block.png (100%) rename mods/{default => mcl_core}/textures/default_large_chest_bg.png (100%) rename mods/{default => mcl_core}/textures/default_lava.png (100%) rename mods/{default => mcl_core}/textures/default_lava_flowing_animated.png (100%) rename mods/{default => mcl_core}/textures/default_lava_source_animated.png (100%) rename mods/{default => mcl_core}/textures/default_leaves.png (100%) rename mods/{default => mcl_core}/textures/default_leaves_big_oak.png (100%) rename mods/{default => mcl_core}/textures/default_leaves_birch.png (100%) rename mods/{default => mcl_core}/textures/default_log_big_oak.png (100%) rename mods/{default => mcl_core}/textures/default_log_big_oak_top.png (100%) rename mods/{default => mcl_core}/textures/default_log_birch.png (100%) rename mods/{default => mcl_core}/textures/default_log_birch_top.png (100%) rename mods/{default => mcl_core}/textures/default_mineral_coal.png (100%) rename mods/{default => mcl_core}/textures/default_mineral_diamond.png (100%) rename mods/{default => mcl_core}/textures/default_mineral_emerald.png (100%) rename mods/{default => mcl_core}/textures/default_mineral_gold.png (100%) rename mods/{default => mcl_core}/textures/default_mineral_iron.png (100%) rename mods/{default => mcl_core}/textures/default_mineral_lapis.png (100%) rename mods/{default => mcl_core}/textures/default_mineral_redstone.png (100%) rename mods/{default => mcl_core}/textures/default_mossycobble.png (100%) rename mods/{default => mcl_core}/textures/default_mycelium_side.png (100%) rename mods/{default => mcl_core}/textures/default_mycelium_top.png (100%) rename mods/{default => mcl_core}/textures/default_obsidian.png (100%) rename mods/{default => mcl_core}/textures/default_paper.png (100%) rename mods/{default => mcl_core}/textures/default_papyrus.png (100%) rename mods/{default => mcl_core}/textures/default_planks_big_oak.png (100%) rename mods/{default => mcl_core}/textures/default_planks_birch.png (100%) rename mods/{default => mcl_core}/textures/default_prismarine_anim.png (100%) rename mods/{default => mcl_core}/textures/default_prismarine_bricks.png (100%) rename mods/{default => mcl_core}/textures/default_prismarine_crystals.png (100%) rename mods/{default => mcl_core}/textures/default_prismarine_dark.png (100%) rename mods/{default => mcl_core}/textures/default_prismarine_shard.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_block_bottom.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_block_side.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_block_top.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_chiseled_side.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_chiseled_top.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_crystal.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_ore.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_pillar_side.png (100%) rename mods/{default => mcl_core}/textures/default_quartz_pillar_top.png (100%) rename mods/{default => mcl_core}/textures/default_rail.png (100%) rename mods/{default => mcl_core}/textures/default_rail_crossing.png (100%) rename mods/{default => mcl_core}/textures/default_rail_curved.png (100%) rename mods/{default => mcl_core}/textures/default_rail_t_junction.png (100%) rename mods/{default => mcl_core}/textures/default_red_sand.png (100%) rename mods/{default => mcl_core}/textures/default_redsandstone_bottom.png (100%) rename mods/{default => mcl_core}/textures/default_redsandstone_carved.png (100%) rename mods/{default => mcl_core}/textures/default_redsandstone_normal.png (100%) rename mods/{default => mcl_core}/textures/default_redsandstone_smooth.png (100%) rename mods/{default => mcl_core}/textures/default_redsandstone_top.png (100%) rename mods/{default => mcl_core}/textures/default_redstone_block.png (100%) rename mods/{default => mcl_core}/textures/default_sand.png (100%) rename mods/{default => mcl_core}/textures/default_sandstone_bottom.png (100%) rename mods/{default => mcl_core}/textures/default_sandstone_carved.png (100%) rename mods/{default => mcl_core}/textures/default_sandstone_normal.png (100%) rename mods/{default => mcl_core}/textures/default_sandstone_smooth.png (100%) rename mods/{default => mcl_core}/textures/default_sandstone_top.png (100%) rename mods/{default => mcl_core}/textures/default_sapling.png (100%) rename mods/{default => mcl_core}/textures/default_sapling_big_oak.png (100%) rename mods/{default => mcl_core}/textures/default_sapling_birch.png (100%) rename mods/{default => mcl_core}/textures/default_sea_lantern.png (100%) rename mods/{default => mcl_core}/textures/default_sign.png (100%) rename mods/{default => mcl_core}/textures/default_sign_wall.png (100%) rename mods/{default => mcl_core}/textures/default_slimeblock.png (100%) rename mods/{default => mcl_core}/textures/default_snow.png (100%) rename mods/{default => mcl_core}/textures/default_sponge.png (100%) rename mods/{default => mcl_core}/textures/default_sponge_wet.png (100%) rename mods/{default => mcl_core}/textures/default_spruceleaves.png (100%) rename mods/{default => mcl_core}/textures/default_sprucesapling.png (100%) rename mods/{default => mcl_core}/textures/default_sprucetree.png (100%) rename mods/{default => mcl_core}/textures/default_sprucetree_top.png (100%) rename mods/{default => mcl_core}/textures/default_sprucewood.png (100%) rename mods/{default => mcl_core}/textures/default_steel_block.png (100%) rename mods/{default => mcl_core}/textures/default_steel_ingot.png (100%) rename mods/{default => mcl_core}/textures/default_stick.png (100%) rename mods/{default => mcl_core}/textures/default_stone.png (100%) rename mods/{default => mcl_core}/textures/default_stone_brick.png (100%) rename mods/{default => mcl_core}/textures/default_stonebrick_carved.png (100%) rename mods/{default => mcl_core}/textures/default_stonebrick_cracked.png (100%) rename mods/{default => mcl_core}/textures/default_stonebrick_mossy.png (100%) rename mods/{default => mcl_core}/textures/default_string.png (100%) rename mods/{default => mcl_core}/textures/default_sugar.png (100%) rename mods/{default => mcl_core}/textures/default_sugar_cane.png (100%) rename mods/{default => mcl_core}/textures/default_sulphur.png (100%) rename mods/{default => mcl_core}/textures/default_tallgrass.png (100%) rename mods/{default => mcl_core}/textures/default_tnt_bottom.png (100%) rename mods/{default => mcl_core}/textures/default_tnt_side.png (100%) rename mods/{default => mcl_core}/textures/default_tnt_top.png (100%) rename mods/{default => mcl_core}/textures/default_tool_diamondaxe.png (100%) rename mods/{default => mcl_core}/textures/default_tool_diamondpick.png (100%) rename mods/{default => mcl_core}/textures/default_tool_diamondshovel.png (100%) rename mods/{default => mcl_core}/textures/default_tool_diamondsword.png (100%) rename mods/{default => mcl_core}/textures/default_tool_fishing_pole.png (100%) rename mods/{default => mcl_core}/textures/default_tool_flint_and_steel.png (100%) rename mods/{default => mcl_core}/textures/default_tool_goldaxe.png (100%) rename mods/{default => mcl_core}/textures/default_tool_goldpick.png (100%) rename mods/{default => mcl_core}/textures/default_tool_goldshovel.png (100%) rename mods/{default => mcl_core}/textures/default_tool_goldsword.png (100%) rename mods/{default => mcl_core}/textures/default_tool_shears.png (100%) rename mods/{default => mcl_core}/textures/default_tool_steelaxe.png (100%) rename mods/{default => mcl_core}/textures/default_tool_steelpick.png (100%) rename mods/{default => mcl_core}/textures/default_tool_steelshovel.png (100%) rename mods/{default => mcl_core}/textures/default_tool_steelsword.png (100%) rename mods/{default => mcl_core}/textures/default_tool_stoneaxe.png (100%) rename mods/{default => mcl_core}/textures/default_tool_stonepick.png (100%) rename mods/{default => mcl_core}/textures/default_tool_stoneshovel.png (100%) rename mods/{default => mcl_core}/textures/default_tool_stonesword.png (100%) rename mods/{default => mcl_core}/textures/default_tool_woodaxe.png (100%) rename mods/{default => mcl_core}/textures/default_tool_woodpick.png (100%) rename mods/{default => mcl_core}/textures/default_tool_woodshovel.png (100%) rename mods/{default => mcl_core}/textures/default_tool_woodsword.png (100%) rename mods/{default => mcl_core}/textures/default_torch.png (100%) rename mods/{default => mcl_core}/textures/default_torch_animated.png (100%) rename mods/{default => mcl_core}/textures/default_torch_on_ceiling.png (100%) rename mods/{default => mcl_core}/textures/default_torch_on_ceiling_animated.png (100%) rename mods/{default => mcl_core}/textures/default_torch_on_floor.png (100%) rename mods/{default => mcl_core}/textures/default_torch_on_floor_animated.png (100%) rename mods/{default => mcl_core}/textures/default_tree.png (100%) rename mods/{default => mcl_core}/textures/default_tree_top.png (100%) rename mods/{default => mcl_core}/textures/default_vine.png (100%) rename mods/{default => mcl_core}/textures/default_water.png (100%) rename mods/{default => mcl_core}/textures/default_water_flowing_animated.png (100%) rename mods/{default => mcl_core}/textures/default_water_source_animated.png (100%) rename mods/{default => mcl_core}/textures/default_wood.png (100%) rename mods/{default => mcl_core}/textures/door_wood.png (100%) rename mods/{default => mcl_core}/textures/door_wood_a.png (100%) rename mods/{default => mcl_core}/textures/door_wood_a_r.png (100%) rename mods/{default => mcl_core}/textures/door_wood_b.png (100%) rename mods/{default => mcl_core}/textures/door_wood_b_r.png (100%) rename mods/{default => mcl_core}/textures/fishing_pole.png (100%) rename mods/{default => mcl_core}/textures/heart.png (100%) rename mods/{default => mcl_core}/textures/moon.png (100%) rename mods/{default => mcl_core}/textures/player.png (100%) rename mods/{default => mcl_core}/textures/player_back.png (100%) rename mods/{default => mcl_core}/textures/sun.png (100%) rename mods/{default => mcl_core}/textures/treeprop.png (100%) rename mods/{default => mcl_core}/textures/web.png (100%) rename mods/{default => mcl_core}/textures/wieldhand.png (100%) rename mods/{default => mcl_core}/tools.lua (85%) create mode 100644 mods/mcl_mobitems/depends.txt diff --git a/mods/beds/depends.txt b/mods/beds/depends.txt index 7f2081be3b..6f4744dccd 100644 --- a/mods/beds/depends.txt +++ b/mods/beds/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core mcl_wool diff --git a/mods/beds/init.lua b/mods/beds/init.lua index 001308f1e9..99afba9a89 100644 --- a/mods/beds/init.lua +++ b/mods/beds/init.lua @@ -55,7 +55,7 @@ minetest.register_node("beds:bed_bottom", { paramtype2 = "facedir", stack_max = 1, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,deco_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, @@ -152,7 +152,7 @@ minetest.register_node("beds:bed_top", { paramtype2 = "facedir", is_ground_content = false, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), node_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5}, diff --git a/mods/bookex/depends.txt b/mods/bookex/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/bookex/depends.txt +++ b/mods/bookex/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/bookex/init.lua b/mods/bookex/init.lua index 04906e609b..33e1edd320 100644 --- a/mods/bookex/init.lua +++ b/mods/bookex/init.lua @@ -10,7 +10,7 @@ local function deepcopy ( t ) return nt; end -local newbook = deepcopy(minetest.registered_items["default:book"]); +local newbook = deepcopy(minetest.registered_items["mcl_core:book"]); newbook.on_use = function ( itemstack, user, pointed_thing ) @@ -21,16 +21,16 @@ newbook.on_use = function ( itemstack, user, pointed_thing ) "textarea[0.5,0.25;7.5,9.25;text;;"..minetest.formspec_escape(text).."]".. "button_exit[3,8.25;2,1;ok;Exit]"; - minetest.show_formspec(user:get_player_name(), "default:book", formspec); + minetest.show_formspec(user:get_player_name(), "mcl_core:book", formspec); end -minetest.register_craftitem(":default:book", newbook); +minetest.register_craftitem(":mcl_core:book", newbook); minetest.register_on_player_receive_fields(function ( player, formname, fields ) - if ((formname == "default:book") and fields and fields.text) then + if ((formname == "mcl_core:book") and fields and fields.text) then local stack = player:get_wielded_item(); - if (stack:get_name() and (stack:get_name() == "default:book")) then + if (stack:get_name() and (stack:get_name() == "mcl_core:book")) then local t = stack:to_table(); t.metadata = fields.text; player:set_wielded_item(ItemStack(t)); diff --git a/mods/bucket/depends.txt b/mods/bucket/depends.txt index 3a7daa1d73..315237e07b 100644 --- a/mods/bucket/depends.txt +++ b/mods/bucket/depends.txt @@ -1,2 +1 @@ -default - +mcl_core diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua index b3ea13b1c9..b2da689e89 100644 --- a/mods/bucket/init.lua +++ b/mods/bucket/init.lua @@ -10,8 +10,8 @@ minetest.register_alias("bucket_lava", "bucket:bucket_lava") minetest.register_craft({ output = 'bucket:bucket_empty 1', recipe = { - {'default:steel_ingot', '', 'default:steel_ingot'}, - {'', 'default:steel_ingot', ''}, + {'mcl_core:steel_ingot', '', 'mcl_core:steel_ingot'}, + {'', 'mcl_core:steel_ingot', ''}, } }) @@ -130,16 +130,16 @@ minetest.register_craftitem("bucket:bucket_empty", { }) bucket.register_liquid( - "default:water_source", - "default:water_flowing", + "mcl_core:water_source", + "mcl_core:water_flowing", "bucket:bucket_water", "bucket_water.png", "Water Bucket" ) bucket.register_liquid( - "default:lava_source", - "default:lava_flowing", + "mcl_core:lava_source", + "mcl_core:lava_flowing", "bucket:bucket_lava", "bucket_lava.png", "Lava Bucket" diff --git a/mods/builtin_item/init.lua b/mods/builtin_item/init.lua index 5782d9a9c6..5db1de62be 100644 --- a/mods/builtin_item/init.lua +++ b/mods/builtin_item/init.lua @@ -100,7 +100,7 @@ minetest.register_entity(":__builtin:item", { return end - --[[ if name == "default:water_source" then + --[[ if name == "mcl_core:water_source" then self.object:setacceleration({x = 0, y = 4, z = 0}) else self.object:setacceleration({x = 0, y = -10, z = 0}) @@ -120,7 +120,7 @@ minetest.register_entity(":__builtin:item", { local name = minetest.get_node(pos).name local par2 = minetest.get_node(pos).param2 - if name == "default:water_flowing" and par2 < param2 then + if name == "mcl_core:water_flowing" and par2 < param2 then return pos end diff --git a/mods/craftingpack/crafting/creative.lua b/mods/craftingpack/crafting/creative.lua index 3095f55a5d..f6b6dbfd5a 100644 --- a/mods/craftingpack/crafting/creative.lua +++ b/mods/craftingpack/crafting/creative.lua @@ -232,10 +232,10 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page, "image[" .. boffset[check] .. ";1,1;crafting_creative_marker.png]" end formspec = "size[10,9.3]".. - default.inventory_header.. + mcl_core.inventory_header.. "background[-0.19,-0.25;10.5,9.87;"..inv_bg.."]".. "label[-5,-5;"..name.."]".. - "item_image_button[-0.1,0;1,1;default:brick;blocks;]".. --build blocks + "item_image_button[-0.1,0;1,1;mcl_core:brick;blocks;]".. --build blocks tab(name, "blocks") .. "tooltip[blocks;Building Blocks]".. "item_image_button[1.15,0;1,1;mcl_flowers:peony;deco;]".. --decoration blocks @@ -256,19 +256,19 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page, "image[0,1;5,0.75;fnt_"..name..".png]".. "list[current_player;main;0,7;9,1;]".. main_list.. - "item_image_button[-0.1,8.37;1,1;default:apple;food;]".. --foodstuff + "item_image_button[-0.1,8.37;1,1;mcl_core:apple;food;]".. --foodstuff tab(name, "food") .. "tooltip[food;Foodstuffs]".. - "item_image_button[1.15,8.37;1,1;default:axe_steel;tools;]".. --tools + "item_image_button[1.15,8.37;1,1;mcl_core:axe_steel;tools;]".. --tools tab(name, "tools") .. "tooltip[tools;Tools]".. - "item_image_button[2.415,8.37;1,1;default:sword_gold;combat;]".. --combat + "item_image_button[2.415,8.37;1,1;mcl_core:sword_gold;combat;]".. --combat tab(name, "combat") .. "tooltip[combat;Combat]".. "item_image_button[3.693,8.37;1,1;mcl_potions:glass_bottle;brew;]".. --brewing tab(name, "brew") .. "tooltip[brew;Brewing]".. - "item_image_button[4.938,8.37;1,1;default:stick;matr;]".. --materials + "item_image_button[4.938,8.37;1,1;mcl_core:stick;matr;]".. --materials tab(name, "matr") .. "tooltip[matr;Materials]".. "item_image_button[9.19,8.37;1,1;mcl_chests:chest;inv;]".. --inventory diff --git a/mods/craftingpack/crafting/depends.txt b/mods/craftingpack/crafting/depends.txt index 331d858ce9..315237e07b 100644 --- a/mods/craftingpack/crafting/depends.txt +++ b/mods/craftingpack/crafting/depends.txt @@ -1 +1 @@ -default \ No newline at end of file +mcl_core diff --git a/mods/craftingpack/crafting/init.lua b/mods/craftingpack/crafting/init.lua index fdb7a4c7ba..4daff114d4 100644 --- a/mods/craftingpack/crafting/init.lua +++ b/mods/craftingpack/crafting/init.lua @@ -82,7 +82,7 @@ local function set_inventory(player) local form = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory.png"..armor_img.."]".. - default.inventory_header.. + mcl_core.inventory_header.. img_element.. --armor "list[detached:"..player_name.."_armor;armor;0,0;1,1;1]".. @@ -110,7 +110,7 @@ local function set_workbench(player) local form = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_workbench.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[current_player;craft;1.75,0.5;3,3;]".. @@ -168,7 +168,7 @@ minetest.register_node("crafting:workbench", { on_rightclick = function(pos, node, clicker, itemstack) set_workbench(clicker) end, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ diff --git a/mods/craftingpack/inventory_plus/depends.txt b/mods/craftingpack/inventory_plus/depends.txt deleted file mode 100644 index 23df25cb84..0000000000 --- a/mods/craftingpack/inventory_plus/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -crafting \ No newline at end of file diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua deleted file mode 100644 index 1bf2088324..0000000000 --- a/mods/default/crafting.lua +++ /dev/null @@ -1,1058 +0,0 @@ --- mods/default/crafting.lua - --- --- Crafting definition --- - -minetest.register_craft({ - output = 'default:wood 4', - recipe = { - {'default:tree'}, - } -}) - -minetest.register_craft({ - output = 'default:darkwood 4', - recipe = { - {'default:darktree'}, - } -}) - -minetest.register_craft({ - output = 'default:junglewood 4', - recipe = { - {'default:jungletree'}, - } -}) - -minetest.register_craft({ - output = 'default:acaciawood 4', - recipe = { - {'default:acaciatree'}, - } -}) - -minetest.register_craft({ - output = 'default:sprucewood 4', - recipe = { - {'default:sprucetree'}, - } -}) - -minetest.register_craft({ - output = 'default:birchwood 4', - recipe = { - {'default:birchtree'}, - } -}) - -minetest.register_craft({ - output = "default:torch 4", - recipe = { - { "group:coal" }, - { "default:stick" }, - } -}) - -minetest.register_craft({ - type = 'shapeless', - output = 'default:mossycobble', - recipe = { 'default:cobble', 'default:vine' }, -}) - -minetest.register_craft({ - type = 'shapeless', - output = 'default:stonebrickmossy', - recipe = { 'default:stonebrick', 'default:vine' }, -}) - -minetest.register_craft({ - output = 'default:coarse_dirt 4', - recipe = { - {'default:dirt', 'default:gravel'}, - {'default:gravel', 'default:dirt'}, - } -}) -minetest.register_craft({ - output = 'default:coarse_dirt 4', - recipe = { - {'default:gravel', 'default:dirt'}, - {'default:dirt', 'default:gravel'}, - } -}) - -minetest.register_craft({ - output = 'default:sandstonesmooth 4', - recipe = { - {'default:sandstone','default:sandstone'}, - {'default:sandstone','default:sandstone'}, - } -}) - -minetest.register_craft({ - output = 'default:redsandstonesmooth 4', - recipe = { - {'default:redsandstone','default:redsandstone'}, - {'default:redsandstone','default:redsandstone'}, - } -}) - -minetest.register_craft({ - output = 'default:granite_smooth 4', - recipe = { - {'default:granite', 'default:granite'}, - {'default:granite', 'default:granite'} - }, -}) - -minetest.register_craft({ - output = 'default:andesite_smooth 4', - recipe = { - {'default:andesite', 'default:andesite'}, - {'default:andesite', 'default:andesite'} - }, -}) - -minetest.register_craft({ - output = 'default:diorite_smooth 4', - recipe = { - {'default:diorite', 'default:diorite'}, - {'default:diorite', 'default:diorite'} - }, -}) - -minetest.register_craft({ - type = "shapeless", - output = 'default:granite', - recipe = {'default:diorite', 'default:quartz_crystal'}, -}) - -minetest.register_craft({ - type = "shapeless", - output = 'default:andesite 2', - recipe = {'default:diorite', 'default:cobble'}, -}) - -minetest.register_craft({ - output = 'default:diorite 2', - recipe = { - {'default:cobble', 'default:quartz_crystal'}, - {'default:quartz_crystal', 'default:cobble'}, - } -}) -minetest.register_craft({ - output = 'default:diorite 2', - recipe = { - {'default:quartz_crystal', 'default:cobble'}, - {'default:cobble', 'default:quartz_crystal'}, - } -}) - -minetest.register_craft({ - output = "mcl_dye:bone_block", - recipe = { - { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, - { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, - { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, - }, -}) - -minetest.register_craft({ - output = "mcl_dye:white 9", - recipe = { - { "mcl_dye:bone_block" }, - }, -}) - -minetest.register_craft({ - output = 'default:stick 4', - recipe = { - {'group:wood'}, - {'group:wood'}, - } -}) - -minetest.register_craft({ - output = 'signs:sign_wall 3', - recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'group:wood', 'group:wood'}, - {'', 'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:pick_wood', - recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'', 'default:stick', ''}, - {'', 'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:pick_stone', - recipe = { - {'default:cobble', 'default:cobble', 'default:cobble'}, - {'', 'default:stick', ''}, - {'', 'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:pick_steel', - recipe = { - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - {'', 'default:stick', ''}, - {'', 'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:pick_gold', - recipe = { - {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, - {'', 'default:stick', ''}, - {'', 'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:pick_diamond', - recipe = { - {'default:diamond', 'default:diamond', 'default:diamond'}, - {'', 'default:stick', ''}, - {'', 'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:shovel_wood', - recipe = { - {'group:wood'}, - {'default:stick'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:shovel_stone', - recipe = { - {'default:cobble'}, - {'default:stick'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:shovel_steel', - recipe = { - {'default:steel_ingot'}, - {'default:stick'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:shovel_gold', - recipe = { - {'default:gold_ingot'}, - {'default:stick'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:shovel_diamond', - recipe = { - {'default:diamond'}, - {'default:stick'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:axe_wood', - recipe = { - {'group:wood', 'group:wood'}, - {'group:wood', 'default:stick'}, - {'', 'default:stick'}, - } -}) -minetest.register_craft({ - output = 'default:axe_wood', - recipe = { - {'group:wood', 'group:wood'}, - {'default:stick', 'group:wood'}, - {'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:axe_stone', - recipe = { - {'default:cobble', 'default:cobble'}, - {'default:cobble', 'default:stick'}, - {'', 'default:stick'}, - } -}) -minetest.register_craft({ - output = 'default:axe_stone', - recipe = { - {'default:cobble', 'default:cobble'}, - {'default:stick', 'default:cobble'}, - {'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:axe_steel', - recipe = { - {'default:steel_ingot', 'default:steel_ingot'}, - {'default:steel_ingot', 'default:stick'}, - {'', 'default:stick'}, - } -}) -minetest.register_craft({ - output = 'default:axe_steel', - recipe = { - {'default:steel_ingot', 'default:steel_ingot'}, - {'default:stick', 'default:steel_ingot'}, - {'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:axe_gold', - recipe = { - {'default:gold_ingot', 'default:gold_ingot'}, - {'default:gold_ingot', 'default:stick'}, - {'', 'default:stick'}, - } -}) -minetest.register_craft({ - output = 'default:axe_gold', - recipe = { - {'default:gold_ingot', 'default:gold_ingot'}, - {'default:stick', 'default:gold_ingot'}, - {'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:axe_diamond', - recipe = { - {'default:diamond', 'default:diamond'}, - {'default:diamond', 'default:stick'}, - {'', 'default:stick'}, - } -}) -minetest.register_craft({ - output = 'default:axe_diamond', - recipe = { - {'default:diamond', 'default:diamond'}, - {'default:stick', 'default:diamond'}, - {'default:stick', ''}, - } -}) - -minetest.register_craft({ - output = 'default:sword_wood', - recipe = { - {'group:wood'}, - {'group:wood'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:sword_stone', - recipe = { - {'default:cobble'}, - {'default:cobble'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:sword_steel', - recipe = { - {'default:steel_ingot'}, - {'default:steel_ingot'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:sword_gold', - recipe = { - {'default:gold_ingot'}, - {'default:gold_ingot'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:sword_diamond', - recipe = { - {'default:diamond'}, - {'default:diamond'}, - {'default:stick'}, - } -}) - -minetest.register_craft({ - type = 'shapeless', - output = 'default:flint_and_steel', - recipe = { 'default:steel_ingot', 'default:flint'}, -}) - -minetest.register_craft({ - output = 'default:shears', - recipe = { - { 'default:steel_ingot', '' }, - { '', 'default:steel_ingot', }, - } -}) -minetest.register_craft({ - output = 'default:shears', - recipe = { - { '', 'default:steel_ingot', }, - { 'default:steel_ingot', '' }, - } -}) - -minetest.register_craft({ - output = "default:fishing_rod", - recipe = { - {'','','default:stick'}, - {'','default:stick','default:string'}, - {'default:stick','','default:string'}, - } -}) -minetest.register_craft({ - output = "default:fishing_rod", - recipe = { - {'default:stick', '', ''}, - {'default:string', 'default:stick', ''}, - {'default:string','','default:stick'}, - } -}) - - - -minetest.register_craft({ - output = 'default:rail 16', - recipe = { - {'default:steel_ingot', '', 'default:steel_ingot'}, - {'default:steel_ingot', 'default:stick', 'default:steel_ingot'}, - {'default:steel_ingot', '', 'default:steel_ingot'}, - } -}) - -minetest.register_craft({ - output = 'default:haybale', - recipe = { - {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, - {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, - {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, - } -}) - -minetest.register_craft({ - output = 'mcl_farming:wheat_harvested 9', - recipe = { - {'default:haybale'}, - } -}) - -minetest.register_craft({ - output = 'default:sea_lantern', - recipe = { - {'default:prismarine_shard', 'default:prismarine_cry', 'default:prismarine_shard'}, - {'default:prismarine_cry', 'default:prismarine_cry', 'default:prismarine_cry'}, - {'default:prismarine_shard', 'default:prismarine_cry', 'default:prismarine_shard'}, - } -}) - -minetest.register_craft({ - output = 'default:prismarine', - recipe = { - {'default:prismarine_shard', 'default:prismarine_shard'}, - {'default:prismarine_shard', 'default:prismarine_shard'}, - } -}) - -minetest.register_craft({ - output = 'default:prismarine_brick', - recipe = { - {'default:prismarine_shard', 'default:prismarine_shard', 'default:prismarine_shard'}, - {'default:prismarine_shard', 'default:prismarine_shard', 'default:prismarine_shard'}, - {'default:prismarine_shard', 'default:prismarine_shard', 'default:prismarine_shard'}, - } -}) - -minetest.register_craft({ - output = 'default:prismarine_dark', - recipe = { - {'default:prismarine_shard', 'default:prismarine_shard', 'default:prismarine_shard'}, - {'default:prismarine_shard', 'mcl_dye:black', 'default:prismarine_shard'}, - {'default:prismarine_shard', 'default:prismarine_shard', 'default:prismarine_shard'}, - } -}) - -minetest.register_craft({ - output = 'default:coalblock', - recipe = { - {'default:coal_lump', 'default:coal_lump', 'default:coal_lump'}, - {'default:coal_lump', 'default:coal_lump', 'default:coal_lump'}, - {'default:coal_lump', 'default:coal_lump', 'default:coal_lump'}, - } -}) - -minetest.register_craft({ - output = 'default:coal_lump 9', - recipe = { - {'default:coalblock'}, - } -}) - -minetest.register_craft({ - output = 'default:steelblock', - recipe = { - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - } -}) - -minetest.register_craft({ - output = 'default:steel_ingot 9', - recipe = { - {'default:steelblock'}, - } -}) - -minetest.register_craft({ - output = 'default:goldblock', - recipe = { - {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, - {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, - {'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'}, - } -}) - -minetest.register_craft({ - output = 'default:gold_ingot 9', - recipe = { - {'default:goldblock'}, - } -}) - -minetest.register_craft({ - output = "default:gold_nugget 9", - recipe = {{"default:gold_ingot"}}, -}) - -minetest.register_craft({ - output = "default:iron_nugget 9", - recipe = {{"default:steel_ingot"}}, -}) - -minetest.register_craft({ - output = "default:gold_ingot", - recipe = { - {"default:gold_nugget", "default:gold_nugget", "default:gold_nugget"}, - {"default:gold_nugget", "default:gold_nugget", "default:gold_nugget"}, - {"default:gold_nugget", "default:gold_nugget", "default:gold_nugget"}, - } -}) - -minetest.register_craft({ - output = "default:steel_ingot", - recipe = { - {"default:iron_nugget", "default:iron_nugget", "default:iron_nugget"}, - {"default:iron_nugget", "default:iron_nugget", "default:iron_nugget"}, - {"default:iron_nugget", "default:iron_nugget", "default:iron_nugget"}, - } -}) - -minetest.register_craft({ - output = 'default:sandstone', - recipe = { - {'default:sand', 'default:sand'}, - {'default:sand', 'default:sand'}, - } -}) - -minetest.register_craft({ - output = 'default:redsandstone', - recipe = { - {'default:redsand', 'default:redsand'}, - {'default:redsand', 'default:redsand'}, - } -}) - -minetest.register_craft({ - output = 'default:clay', - recipe = { - {'default:clay_lump', 'default:clay_lump'}, - {'default:clay_lump', 'default:clay_lump'}, - } -}) - -minetest.register_craft({ - output = 'default:brick', - recipe = { - {'default:clay_brick', 'default:clay_brick'}, - {'default:clay_brick', 'default:clay_brick'}, - } -}) - -minetest.register_craft({ - output = 'default:paper 3', - recipe = { - {'default:reeds', 'default:reeds', 'default:reeds'}, - } -}) - -minetest.register_craft({ - type = 'shapeless', - output = 'default:book', - recipe = { 'default:paper', 'default:paper', 'default:paper', 'mcl_mobitems:leather', - } -}) - -minetest.register_craft({ - output = 'default:bookshelf', - recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'default:book', 'default:book', 'default:book'}, - {'group:wood', 'group:wood', 'group:wood'}, - } -}) - -minetest.register_craft({ - output = 'default:ladder 3', - recipe = { - {'default:stick', '', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', '', 'default:stick'}, - } -}) - -minetest.register_craft({ - output = 'default:stonebrick 4', - recipe = { - {'default:stone', 'default:stone'}, - {'default:stone', 'default:stone'}, - } -}) - --- TODO: Remove recipe when mobs are working -minetest.register_craft({ - type = "shapeless", - output = "default:gunpowder", - recipe = { - 'default:sand', - 'default:gravel', - } -}) - -minetest.register_craft({ - output = 'default:lapisblock', - recipe = { - {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, - {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, - {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, - } -}) - -minetest.register_craft({ - output = 'mcl_dye:blue 9', - recipe = { - {'default:lapisblock'}, - } -}) - -minetest.register_craft({ - output = "default:emeraldblock", - recipe = { - {'default:emerald', 'default:emerald', 'default:emerald'}, - {'default:emerald', 'default:emerald', 'default:emerald'}, - {'default:emerald', 'default:emerald', 'default:emerald'}, - } -}) - -minetest.register_craft({ - output = 'default:emerald 9', - recipe = { - {'default:emeraldblock'}, - } -}) - -minetest.register_craft({ - output = "default:diamondblock", - recipe = { - {'default:diamond', 'default:diamond', 'default:diamond'}, - {'default:diamond', 'default:diamond', 'default:diamond'}, - {'default:diamond', 'default:diamond', 'default:diamond'}, - } -}) - -minetest.register_craft({ - output = 'default:diamond 9', - recipe = { - {'default:diamondblock'}, - } -}) - -minetest.register_craft({ - output = "default:glowstone", - recipe = { - {'default:glowstone_dust', 'default:glowstone_dust'}, - {'default:glowstone_dust', 'default:glowstone_dust'}, - } -}) - -minetest.register_craft({ - output = 'default:glowstone_dust 4', - recipe = { - {'default:glowstone'}, - } -}) - -minetest.register_craft({ - output = "default:apple_gold", - recipe = { - {"default:gold_ingot", "default:gold_ingot", "default:gold_ingot"}, - {"default:gold_ingot", 'default:apple', "default:gold_ingot"}, - {"default:gold_ingot", "default:gold_ingot", "default:gold_ingot"}, - } -}) - -minetest.register_craft({ - output = "default:sugar", - recipe = { - {"default:reeds"}, - } -}) - -minetest.register_craft({ - output = "default:bowl 4", - recipe = { - {"group:wood", "", "group:wood"}, - {"", "group:wood", ""}, - } -}) - -minetest.register_craft({ - output = 'default:snowblock', - recipe = { - {'mcl_throwing:snowball', 'mcl_throwing:snowball'}, - {'mcl_throwing:snowball', 'mcl_throwing:snowball'}, - } -}) - -minetest.register_craft({ - output = 'default:snow 6', - recipe = { - {'default:snowblock', 'default:snowblock', 'default:snowblock'}, - } -}) - -minetest.register_craft({ - output = 'default:quartz_block', - recipe = { - {'default:quartz_crystal', 'default:quartz_crystal'}, - {'default:quartz_crystal', 'default:quartz_crystal'}, - } -}) - -minetest.register_craft({ - output = 'default:quartz_chiseled 2', - recipe = { - {'stairs:slab_quartzblock'}, - {'stairs:slab_quartzblock'}, - } -}) - -minetest.register_craft({ - output = 'default:quartz_pillar 2', - recipe = { - {'default:quartz_block'}, - {'default:quartz_block'}, - } -}) - - --- --- Crafting (tool repair) --- -minetest.register_craft({ - type = "toolrepair", - additional_wear = -0.05, -}) - --- --- Cooking recipes --- - -minetest.register_craft({ - type = "cooking", - output = "default:glass", - recipe = "group:sand", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:stone", - recipe = "default:cobble", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:stonebrickcracked", - recipe = "default:stonebrick", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:steel_ingot", - recipe = "default:stone_with_iron", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:gold_ingot", - recipe = "default:stone_with_gold", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:quartz_crystal", - recipe = "default:quartz_ore", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:clay_brick", - recipe = "default:clay_lump", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:fish", - recipe = "default:fish_raw", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:charcoal_lump", - recipe = "group:tree", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:sponge", - recipe = "default:sponge_wet", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:coal_lump", - recipe = "default:stone_with_coal", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:diamond", - recipe = "default:stone_with_diamond", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:emerald", - recipe = "default:stone_with_emerald", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "mcl_dye:blue", - recipe = "default:stone_with_lapis", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:gold_nugget", - recipe = "default:sword_gold", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:gold_nugget", - recipe = "default:axe_gold", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:gold_nugget", - recipe = "default:shovel_gold", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:gold_nugget", - recipe = "default:pick_gold", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:iron_nugget", - recipe = "default:sword_steel", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:iron_nugget", - recipe = "default:axe_steel", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:iron_nugget", - recipe = "default:shovel_steel", - cooktime = 10, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:iron_nugget", - recipe = "default:pick_steel", - cooktime = 10, -}) - - - --- --- Fuels --- - -minetest.register_craft({ - type = "fuel", - recipe = "default:coalblock", - burntime = 800, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:coal_lump", - burntime = 80, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:charcoal_lump", - burntime = 80, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "group:tree", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:bookshelf", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:ladder", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "group:wood", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:fishing_rod", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:pick_wood", - burntime = 10, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:shovel_wood", - burntime = 10, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:sword_wood", - burntime = 10, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:axe_wood", - burntime = 10, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "group:sapling", - burntime = 5, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:bowl", - burntime = 5, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:stick", - burntime = 5, -}) - --- ---Temporary --- TODO: Remove when string is ready -minetest.register_craft({ - output = "default:string", - recipe = {{"default:paper",}, - {"default:paper"}}, -}) diff --git a/mods/default/init.lua b/mods/default/init.lua deleted file mode 100644 index 00ab73ba1f..0000000000 --- a/mods/default/init.lua +++ /dev/null @@ -1,29 +0,0 @@ --- Minetest 0.4 mod: default --- See README.txt for licensing and other information. --- The API documentation in here was moved into doc/lua_api.txt - --- Definitions made by this mod that other mods can use too -default = {} -default.gui_slots = "listcolors[#9990;#FFF7;#FFF0;#000;#FFF]" -default.gui_bg = "bgcolor[#080808BB;true]" -default.gui_bg_img = "" - -default.inventory_header = default.gui_slots .. default.gui_bg - -minetest.nodedef_default.stack_max = 64 -minetest.craftitemdef_default.stack_max = 64 - --- Load files -dofile(minetest.get_modpath("default").."/functions.lua") -dofile(minetest.get_modpath("default").."/nodes.lua") -dofile(minetest.get_modpath("default").."/tools.lua") -dofile(minetest.get_modpath("default").."/craftitems.lua") -dofile(minetest.get_modpath("default").."/crafting.lua") -dofile(minetest.get_modpath("default").."/mapgen.lua") -dofile(minetest.get_modpath("default").."/player.lua") - --- Aliases -minetest.register_alias("default:desert_sand", "default:sand") -minetest.register_alias("default:desert_stone", "default:sandstone") -minetest.register_alias("default:iron_lump", "default:stone_with_iron") -minetest.register_alias("default:gold_lump", "default:stone_with_gold") diff --git a/mods/doors/depends.txt b/mods/doors/depends.txt index 562cf6328d..7642bee0a9 100644 --- a/mods/doors/depends.txt +++ b/mods/doors/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/doors/init.lua b/mods/doors/init.lua index e68d7d6e05..37d0e46baa 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -301,15 +301,15 @@ doors:register_door("doors:door_wood", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1}, tiles_bottom = {"door_wood_b.png", "door_brown.png"}, tiles_top = {"door_wood_a.png", "door_brown.png"}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ output = "doors:door_wood 3", recipe = { - {"default:wood", "default:wood"}, - {"default:wood", "default:wood"}, - {"default:wood", "default:wood"} + {"mcl_core:wood", "mcl_core:wood"}, + {"mcl_core:wood", "mcl_core:wood"}, + {"mcl_core:wood", "mcl_core:wood"} } }) @@ -320,15 +320,15 @@ doors:register_door("doors:door_acacia", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1}, tiles_bottom = {"door_acacia_b.png", "door_brown.png"}, tiles_top = {"door_acacia_a.png", "door_brown.png"}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ output = "doors:door_acacia 3", recipe = { - {"default:acaciawood", "default:acaciawood"}, - {"default:acaciawood", "default:acaciawood"}, - {"default:acaciawood", "default:acaciawood"} + {"mcl_core:acaciawood", "mcl_core:acaciawood"}, + {"mcl_core:acaciawood", "mcl_core:acaciawood"}, + {"mcl_core:acaciawood", "mcl_core:acaciawood"} } }) @@ -339,15 +339,15 @@ doors:register_door("doors:door_birch", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1}, tiles_bottom = {"door_birch_b.png", "door_brown.png"}, tiles_top = {"door_birch_a.png", "door_brown.png"}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ output = "doors:door_birch 3", recipe = { - {"default:birchwood", "default:birchwood"}, - {"default:birchwood", "default:birchwood"}, - {"default:birchwood", "default:birchwood"}, + {"mcl_core:birchwood", "mcl_core:birchwood"}, + {"mcl_core:birchwood", "mcl_core:birchwood"}, + {"mcl_core:birchwood", "mcl_core:birchwood"}, } }) @@ -358,15 +358,15 @@ doors:register_door("doors:door_dark_oak", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1}, tiles_bottom = {"door_dark_oak_b.png", "door_brown.png"}, tiles_top = {"door_dark_oak_a.png", "door_brown.png"}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ output = "doors:door_dark_oak 3", recipe = { - {"default:darkwood", "default:darkwood"}, - {"default:darkwood", "default:darkwood"}, - {"default:darkwood", "default:darkwood"}, + {"mcl_core:darkwood", "mcl_core:darkwood"}, + {"mcl_core:darkwood", "mcl_core:darkwood"}, + {"mcl_core:darkwood", "mcl_core:darkwood"}, } }) @@ -377,15 +377,15 @@ doors:register_door("doors:door_jungle", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1}, tiles_bottom = {"door_jungle_b.png", "door_brown.png"}, tiles_top = {"door_jungle_a.png", "door_brown.png"}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ output = "doors:door_jungle 3", recipe = { - {"default:junglewood", "default:junglewood"}, - {"default:junglewood", "default:junglewood"}, - {"default:junglewood", "default:junglewood"} + {"mcl_core:junglewood", "mcl_core:junglewood"}, + {"mcl_core:junglewood", "mcl_core:junglewood"}, + {"mcl_core:junglewood", "mcl_core:junglewood"} } }) @@ -396,15 +396,15 @@ doors:register_door("doors:door_spruce", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1}, tiles_bottom = {"door_spruce_b.png", "door_brown.png"}, tiles_top = {"door_spruce_a.png", "door_brown.png"}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ output = "doors:door_spruce 3", recipe = { - {"default:sprucewood", "default:sprucewood"}, - {"default:sprucewood", "default:sprucewood"}, - {"default:sprucewood", "default:sprucewood"} + {"mcl_core:sprucewood", "mcl_core:sprucewood"}, + {"mcl_core:sprucewood", "mcl_core:sprucewood"}, + {"mcl_core:sprucewood", "mcl_core:sprucewood"} } }) @@ -446,15 +446,15 @@ doors:register_door("doors:door_steel", { groups = {snappy=1,cracky=1,level=2,door=1,mesecon_effector_on=1}, tiles_bottom = {"door_steel_b.png", "door_grey.png"}, tiles_top = {"door_steel_a.png", "door_grey.png"}, - sounds = default.node_sound_metal_defaults(), + sounds = mcl_core.node_sound_metal_defaults(), }) minetest.register_craft({ output = "doors:door_steel 3", recipe = { - {"default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "default:steel_ingot"} + {"mcl_core:steel_ingot", "mcl_core:steel_ingot"}, + {"mcl_core:steel_ingot", "mcl_core:steel_ingot"}, + {"mcl_core:steel_ingot", "mcl_core:steel_ingot"} } }) @@ -504,7 +504,7 @@ minetest.register_node("doors:trapdoor", { stack_max = 64, paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,mesecon_effector_on=1,flammable=2,door=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), drop = "doors:trapdoor", node_box = { type = "fixed", @@ -550,7 +550,7 @@ minetest.register_node("doors:trapdoor_open", { paramtype2 = "facedir", pointable = true, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,mesecon_effector_on=1,flammable=2,door=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), drop = "doors:trapdoor", node_box = { type = "fixed", @@ -628,7 +628,7 @@ minetest.register_node("doors:iron_trapdoor", { stack_max = 64, paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,mesecon_effector_on=1,flammable=0,door=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), drop = "doors:iron_trapdoor", node_box = { type = "fixed", @@ -671,7 +671,7 @@ minetest.register_node("doors:iron_trapdoor_open", { is_ground_content = false, pointable = true, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=0,door=1,mesecon_effector_on=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), drop = "doors:iron_trapdoor", node_box = { type = "fixed", @@ -691,8 +691,8 @@ minetest.register_node("doors:iron_trapdoor_open", { minetest.register_craft({ output = 'doors:iron_trapdoor', recipe = { - {'default:steel_ingot', 'default:steel_ingot', ''}, - {'default:steel_ingot', 'default:steel_ingot', ''}, + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot', ''}, + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot', ''}, {'', '', ''}, } }) diff --git a/mods/drippingwater/depends.txt b/mods/drippingwater/depends.txt index 3a7daa1d73..315237e07b 100644 --- a/mods/drippingwater/depends.txt +++ b/mods/drippingwater/depends.txt @@ -1,2 +1 @@ -default - +mcl_core diff --git a/mods/gemalde/depends.txt b/mods/gemalde/depends.txt index 331d858ce9..315237e07b 100644 --- a/mods/gemalde/depends.txt +++ b/mods/gemalde/depends.txt @@ -1 +1 @@ -default \ No newline at end of file +mcl_core diff --git a/mods/gemalde/init.lua b/mods/gemalde/init.lua index eff6f9d3a3..71fa7679de 100644 --- a/mods/gemalde/init.lua +++ b/mods/gemalde/init.lua @@ -83,9 +83,9 @@ end minetest.register_craft({ output = 'gemalde:node_1', recipe = { - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'group:wool', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, + {'mcl_core:stick', 'mcl_core:stick', 'mcl_core:stick'}, + {'mcl_core:stick', 'group:wool', 'mcl_core:stick'}, + {'mcl_core:stick', 'mcl_core:stick', 'mcl_core:stick'}, } }) diff --git a/mods/hardened_clay/depends.txt b/mods/hardened_clay/depends.txt index 3e757ca65e..12e5d60062 100644 --- a/mods/hardened_clay/depends.txt +++ b/mods/hardened_clay/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core mcl_dye diff --git a/mods/hardened_clay/init.lua b/mods/hardened_clay/init.lua index 9c079242cb..9d37add483 100644 --- a/mods/hardened_clay/init.lua +++ b/mods/hardened_clay/init.lua @@ -25,13 +25,13 @@ minetest.register_node("hardened_clay:hardened_clay", { tiles = {"hardened_clay.png"}, stack_max = 64, groups = {cracky=3,hardened_clay=1,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) minetest.register_craft({ type = "cooking", output = "hardened_clay:hardened_clay", - recipe = "default:clay", + recipe = "mcl_core:clay", cooktime = 10, }) @@ -46,7 +46,7 @@ for _, row in ipairs(clay.dyes) do tiles = {"hardened_clay_stained_"..name..".png"}, groups = {cracky=3,hardened_clay=1,building_block=1}, stack_max = 64, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) if craft_color_group then minetest.register_craft({ diff --git a/mods/hbhunger/depends.txt b/mods/hbhunger/depends.txt index 6bd271b344..e036c709cc 100644 --- a/mods/hbhunger/depends.txt +++ b/mods/hbhunger/depends.txt @@ -1,6 +1,6 @@ hudbars intllib? -default? +mlc_core? flowers? animalmaterials? bucket? diff --git a/mods/itemframes/depends.txt b/mods/itemframes/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/itemframes/depends.txt +++ b/mods/itemframes/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/itemframes/init.lua b/mods/itemframes/init.lua index ca81400bbb..3bc04b2585 100644 --- a/mods/itemframes/init.lua +++ b/mods/itemframes/init.lua @@ -100,7 +100,7 @@ minetest.register_node("itemframes:frame",{ paramtype2 = "facedir", sunlight_propagates = true, groups = { choppy=2,dig_immediate=2,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) @@ -133,8 +133,8 @@ minetest.register_node("itemframes:frame",{ minetest.register_craft({ output = 'itemframes:frame', recipe = { - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'mcl_mobitems:leather', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'}, + {'mcl_core:stick', 'mcl_core:stick', 'mcl_core:stick'}, + {'mcl_core:stick', 'mcl_mobitems:leather', 'mcl_core:stick'}, + {'mcl_core:stick', 'mcl_core:stick', 'mcl_core:stick'}, } }) diff --git a/mods/mcl_boats/depends.txt b/mods/mcl_boats/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_boats/depends.txt +++ b/mods/mcl_boats/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_boats/init.lua b/mods/mcl_boats/init.lua index 2c076ab4cc..ab73c04387 100644 --- a/mods/mcl_boats/init.lua +++ b/mods/mcl_boats/init.lua @@ -135,7 +135,7 @@ end local woods = { "", "_spruce", "_birch", "_jungle", "_dark", "_acacia" } local names = { "Oak Boat", "Spruce Boat", "Birch Boat", "Jungle Boat", "Dark Oak Boat", "Acacia Boat" } -local craftstuffs = { "default:wood", "default:sprucewood", "default:birchwood", "default:junglewood", "default:darkwood", "default:acaciawood" } +local craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:darkwood", "mcl_core:acaciawood" } for w=1, #woods do local textures = {"mcl_boats_texture.png"} diff --git a/mods/mcl_cake/depends.txt b/mods/mcl_cake/depends.txt index 0272d0d9a9..e8ac16a9f2 100644 --- a/mods/mcl_cake/depends.txt +++ b/mods/mcl_cake/depends.txt @@ -1,4 +1,4 @@ -default +mcl_core bucket mcl_farming mcl_mobitems diff --git a/mods/mcl_cake/init.lua b/mods/mcl_cake/init.lua index 92972b6d8b..94f3ef8806 100644 --- a/mods/mcl_cake/init.lua +++ b/mods/mcl_cake/init.lua @@ -15,7 +15,7 @@ minetest.register_craft({ output = "mcl_cake:cake", recipe = { {'mcl_mobitems:milk_bucket', 'mcl_mobitems:milk_bucket', 'mcl_mobitems:milk_bucket'}, - {'default:sugar', 'mcl_throwing:egg', 'default:sugar'}, + {'mcl_core:sugar', 'mcl_throwing:egg', 'mcl_core:sugar'}, {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, }, replacements = { @@ -48,7 +48,7 @@ minetest.register_node("mcl_cake:cake", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_5"), ItemStack("mcl_cake:cake"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_5",param2=0}) end, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_5", { description = "Cake (5 Slices Left)", @@ -70,7 +70,7 @@ minetest.register_node("mcl_cake:cake_5", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_4"), ItemStack("mcl_cake:cake_5"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_4",param2=0}) end, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_4", { description = "Cake (4 Slices Left)", @@ -92,7 +92,7 @@ minetest.register_node("mcl_cake:cake_4", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_3"), ItemStack("mcl_cake:cake_4"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_3",param2=0}) end, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_3", { description = "Cake (3 Slices Left)", @@ -114,7 +114,7 @@ minetest.register_node("mcl_cake:cake_3", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_2"), ItemStack("mcl_cake:cake_3"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_2",param2=0}) end, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_2", { description = "Cake (2 Slices Left)", @@ -136,7 +136,7 @@ minetest.register_node("mcl_cake:cake_2", { minetest.do_item_eat(2, ItemStack("mcl_cake:cake_1"), ItemStack("mcl_cake:cake_2"), clicker, {type="nothing"}) minetest.add_node(pos,{type="node",name="mcl_cake:cake_1",param2=0}) end, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_cake:cake_1", { description = "Cake (1 Slice Left)", @@ -158,5 +158,5 @@ minetest.register_node("mcl_cake:cake_1", { minetest.do_item_eat(2, ItemStack("mcl:cake:cake 0"), ItemStack("mcl_cake:cake_1"), clicker, {type="nothing"}) minetest.remove_node(pos) end, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) diff --git a/mods/mcl_chests/depends.txt b/mods/mcl_chests/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_chests/depends.txt +++ b/mods/mcl_chests/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_chests/init.lua b/mods/mcl_chests/init.lua index 582e12d8a4..13c586aaa9 100644 --- a/mods/mcl_chests/init.lua +++ b/mods/mcl_chests/init.lua @@ -30,7 +30,7 @@ minetest.register_node("mcl_chests:chest", { stack_max = 64, groups = {choppy=2,oddly_breakable_by_hand=2, deco_block=1}, is_ground_content = false, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), on_construct = function(pos) local param2 = minetest.get_node(pos).param2 local meta = minetest.get_meta(pos) @@ -40,7 +40,7 @@ minetest.register_node("mcl_chests:chest", { meta:set_string("formspec", "size[9,11.5]".. "background[-0.19,-0.25;9.41,12.5;crafting_inventory_chest_large.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[nodemeta:"..p.x..","..p.y..","..p.z..";main;0,0.5;9,3;]".. "list[current_name;main;0,3.5;9,3;]".. "list[current_player;main;0,7.5;9,3;9]".. @@ -54,7 +54,7 @@ minetest.register_node("mcl_chests:chest", { m:set_string("formspec", "size[9,11.5]".. "background[-0.19,-0.25;9.41,12.5;crafting_inventory_chest_large.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_name;main;0,0.5;9,3;]".. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,3.5;9,3;]".. "list[current_player;main;0,7.5;9,3;9]".. @@ -69,7 +69,7 @@ minetest.register_node("mcl_chests:chest", { meta:set_string("formspec", "size[9,11.5]".. "background[-0.19,-0.25;9.41,12.5;crafting_inventory_chest_large.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_name;main;0,0.5;9,3;]".. "list[nodemeta:"..p.x..","..p.y..","..p.z..";main;0,3.5;9,3;]".. "list[current_player;main;0,7.5;9,3;9]".. @@ -83,7 +83,7 @@ minetest.register_node("mcl_chests:chest", { m:set_string("formspec", "size[9,11.5]".. "background[-0.19,-0.25;9.41,12.5;crafting_inventory_chest_large.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. "list[current_name;main;0,3.5;9,3;]".. "list[current_player;main;0,7.5;9,3;9]".. @@ -96,7 +96,7 @@ minetest.register_node("mcl_chests:chest", { meta:set_string("formspec", "size[9,8.75]".. "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_name;main;0,0.5;9,3;]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. @@ -141,7 +141,7 @@ minetest.register_node("mcl_chests:chest_left", { groups = {choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1}, drop = "mcl_chests:chest", is_ground_content = false, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), on_destruct = function(pos) local n = minetest.get_node(pos) if n.name == "mcl_chests:chest" then @@ -156,7 +156,7 @@ minetest.register_node("mcl_chests:chest_left", { meta:set_string("formspec", "size[9,8.75]".. "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_name;main;0,0.5;9,3;]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. @@ -199,7 +199,7 @@ minetest.register_node("mcl_chests:chest_right", { groups = {choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1}, drop = "mcl_chests:chest", is_ground_content = false, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), on_destruct = function(pos) local n = minetest.get_node(pos) if n.name == "mcl_chests:chest" then @@ -214,7 +214,7 @@ minetest.register_node("mcl_chests:chest_right", { meta:set_string("formspec", "size[9,8.75]".. "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_name;main;0,0.5;9,3;]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. @@ -257,4 +257,4 @@ minetest.register_craft({ {'group:wood', '', 'group:wood'}, {'group:wood', 'group:wood', 'group:wood'}, } -}) \ No newline at end of file +}) diff --git a/mods/mcl_clock/depends.txt b/mods/mcl_clock/depends.txt index aca967d620..a683d475a0 100644 --- a/mods/mcl_clock/depends.txt +++ b/mods/mcl_clock/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core mesecons diff --git a/mods/mcl_clock/init.lua b/mods/mcl_clock/init.lua index 29670d5721..328d43e5e2 100644 --- a/mods/mcl_clock/init.lua +++ b/mods/mcl_clock/init.lua @@ -75,9 +75,9 @@ end) minetest.register_craft({ output = 'mcl_clock:clock', recipe = { - {'', 'default:gold_ingot', ''}, - {'default:gold_ingot', 'mesecons:redstone', 'default:gold_ingot'}, - {'', 'default:gold_ingot', ''} + {'', 'mcl_core:gold_ingot', ''}, + {'mcl_core:gold_ingot', 'mesecons:redstone', 'mcl_core:gold_ingot'}, + {'', 'mcl_core:gold_ingot', ''} } }) diff --git a/mods/mcl_compass/depends.txt b/mods/mcl_compass/depends.txt index aca967d620..a683d475a0 100644 --- a/mods/mcl_compass/depends.txt +++ b/mods/mcl_compass/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core mesecons diff --git a/mods/mcl_compass/init.lua b/mods/mcl_compass/init.lua index 8b88d951c0..b8c35fed5f 100644 --- a/mods/mcl_compass/init.lua +++ b/mods/mcl_compass/init.lua @@ -55,9 +55,9 @@ end minetest.register_craft({ output = 'mcl_compass:'..stereotype_frame, recipe = { - {'', 'default:steel_ingot', ''}, - {'default:steel_ingot', 'mesecons:redstone', 'default:steel_ingot'}, - {'', 'default:steel_ingot', ''} + {'', 'mcl_core:steel_ingot', ''}, + {'mcl_core:steel_ingot', 'mesecons:redstone', 'mcl_core:steel_ingot'}, + {'', 'mcl_core:steel_ingot', ''} } }) diff --git a/mods/default/README.txt b/mods/mcl_core/README.txt similarity index 100% rename from mods/default/README.txt rename to mods/mcl_core/README.txt diff --git a/mods/mcl_core/crafting.lua b/mods/mcl_core/crafting.lua new file mode 100644 index 0000000000..a75e85f883 --- /dev/null +++ b/mods/mcl_core/crafting.lua @@ -0,0 +1,1058 @@ +-- mods/default/crafting.lua + +-- +-- Crafting definition +-- + +minetest.register_craft({ + output = 'mcl_core:wood 4', + recipe = { + {'mcl_core:tree'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:darkwood 4', + recipe = { + {'mcl_core:darktree'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:junglewood 4', + recipe = { + {'mcl_core:jungletree'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:acaciawood 4', + recipe = { + {'mcl_core:acaciatree'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sprucewood 4', + recipe = { + {'mcl_core:sprucetree'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:birchwood 4', + recipe = { + {'mcl_core:birchtree'}, + } +}) + +minetest.register_craft({ + output = "mcl_core:torch 4", + recipe = { + { "group:coal" }, + { "mcl_core:stick" }, + } +}) + +minetest.register_craft({ + type = 'shapeless', + output = 'mcl_core:mossycobble', + recipe = { 'mcl_core:cobble', 'mcl_core:vine' }, +}) + +minetest.register_craft({ + type = 'shapeless', + output = 'mcl_core:stonebrickmossy', + recipe = { 'mcl_core:stonebrick', 'mcl_core:vine' }, +}) + +minetest.register_craft({ + output = 'mcl_core:coarse_dirt 4', + recipe = { + {'mcl_core:dirt', 'mcl_core:gravel'}, + {'mcl_core:gravel', 'mcl_core:dirt'}, + } +}) +minetest.register_craft({ + output = 'mcl_core:coarse_dirt 4', + recipe = { + {'mcl_core:gravel', 'mcl_core:dirt'}, + {'mcl_core:dirt', 'mcl_core:gravel'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sandstonesmooth 4', + recipe = { + {'mcl_core:sandstone','mcl_core:sandstone'}, + {'mcl_core:sandstone','mcl_core:sandstone'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:redsandstonesmooth 4', + recipe = { + {'mcl_core:redsandstone','mcl_core:redsandstone'}, + {'mcl_core:redsandstone','mcl_core:redsandstone'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:granite_smooth 4', + recipe = { + {'mcl_core:granite', 'mcl_core:granite'}, + {'mcl_core:granite', 'mcl_core:granite'} + }, +}) + +minetest.register_craft({ + output = 'mcl_core:andesite_smooth 4', + recipe = { + {'mcl_core:andesite', 'mcl_core:andesite'}, + {'mcl_core:andesite', 'mcl_core:andesite'} + }, +}) + +minetest.register_craft({ + output = 'mcl_core:diorite_smooth 4', + recipe = { + {'mcl_core:diorite', 'mcl_core:diorite'}, + {'mcl_core:diorite', 'mcl_core:diorite'} + }, +}) + +minetest.register_craft({ + type = "shapeless", + output = 'mcl_core:granite', + recipe = {'mcl_core:diorite', 'mcl_core:quartz_crystal'}, +}) + +minetest.register_craft({ + type = "shapeless", + output = 'mcl_core:andesite 2', + recipe = {'mcl_core:diorite', 'mcl_core:cobble'}, +}) + +minetest.register_craft({ + output = 'mcl_core:diorite 2', + recipe = { + {'mcl_core:cobble', 'mcl_core:quartz_crystal'}, + {'mcl_core:quartz_crystal', 'mcl_core:cobble'}, + } +}) +minetest.register_craft({ + output = 'mcl_core:diorite 2', + recipe = { + {'mcl_core:quartz_crystal', 'mcl_core:cobble'}, + {'mcl_core:cobble', 'mcl_core:quartz_crystal'}, + } +}) + +minetest.register_craft({ + output = "mcl_dye:bone_block", + recipe = { + { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, + { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, + { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, + }, +}) + +minetest.register_craft({ + output = "mcl_dye:white 9", + recipe = { + { "mcl_dye:bone_block" }, + }, +}) + +minetest.register_craft({ + output = 'mcl_core:stick 4', + recipe = { + {'group:wood'}, + {'group:wood'}, + } +}) + +minetest.register_craft({ + output = 'signs:sign_wall 3', + recipe = { + {'group:wood', 'group:wood', 'group:wood'}, + {'group:wood', 'group:wood', 'group:wood'}, + {'', 'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:pick_wood', + recipe = { + {'group:wood', 'group:wood', 'group:wood'}, + {'', 'mcl_core:stick', ''}, + {'', 'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:pick_stone', + recipe = { + {'mcl_core:cobble', 'mcl_core:cobble', 'mcl_core:cobble'}, + {'', 'mcl_core:stick', ''}, + {'', 'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:pick_steel', + recipe = { + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'}, + {'', 'mcl_core:stick', ''}, + {'', 'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:pick_gold', + recipe = { + {'mcl_core:gold_ingot', 'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, + {'', 'mcl_core:stick', ''}, + {'', 'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:pick_diamond', + recipe = { + {'mcl_core:diamond', 'mcl_core:diamond', 'mcl_core:diamond'}, + {'', 'mcl_core:stick', ''}, + {'', 'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:shovel_wood', + recipe = { + {'group:wood'}, + {'mcl_core:stick'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:shovel_stone', + recipe = { + {'mcl_core:cobble'}, + {'mcl_core:stick'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:shovel_steel', + recipe = { + {'mcl_core:steel_ingot'}, + {'mcl_core:stick'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:shovel_gold', + recipe = { + {'mcl_core:gold_ingot'}, + {'mcl_core:stick'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:shovel_diamond', + recipe = { + {'mcl_core:diamond'}, + {'mcl_core:stick'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:axe_wood', + recipe = { + {'group:wood', 'group:wood'}, + {'group:wood', 'mcl_core:stick'}, + {'', 'mcl_core:stick'}, + } +}) +minetest.register_craft({ + output = 'mcl_core:axe_wood', + recipe = { + {'group:wood', 'group:wood'}, + {'mcl_core:stick', 'group:wood'}, + {'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:axe_stone', + recipe = { + {'mcl_core:cobble', 'mcl_core:cobble'}, + {'mcl_core:cobble', 'mcl_core:stick'}, + {'', 'mcl_core:stick'}, + } +}) +minetest.register_craft({ + output = 'mcl_core:axe_stone', + recipe = { + {'mcl_core:cobble', 'mcl_core:cobble'}, + {'mcl_core:stick', 'mcl_core:cobble'}, + {'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:axe_steel', + recipe = { + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot'}, + {'mcl_core:steel_ingot', 'mcl_core:stick'}, + {'', 'mcl_core:stick'}, + } +}) +minetest.register_craft({ + output = 'mcl_core:axe_steel', + recipe = { + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot'}, + {'mcl_core:stick', 'mcl_core:steel_ingot'}, + {'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:axe_gold', + recipe = { + {'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, + {'mcl_core:gold_ingot', 'mcl_core:stick'}, + {'', 'mcl_core:stick'}, + } +}) +minetest.register_craft({ + output = 'mcl_core:axe_gold', + recipe = { + {'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, + {'mcl_core:stick', 'mcl_core:gold_ingot'}, + {'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:axe_diamond', + recipe = { + {'mcl_core:diamond', 'mcl_core:diamond'}, + {'mcl_core:diamond', 'mcl_core:stick'}, + {'', 'mcl_core:stick'}, + } +}) +minetest.register_craft({ + output = 'mcl_core:axe_diamond', + recipe = { + {'mcl_core:diamond', 'mcl_core:diamond'}, + {'mcl_core:stick', 'mcl_core:diamond'}, + {'mcl_core:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sword_wood', + recipe = { + {'group:wood'}, + {'group:wood'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sword_stone', + recipe = { + {'mcl_core:cobble'}, + {'mcl_core:cobble'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sword_steel', + recipe = { + {'mcl_core:steel_ingot'}, + {'mcl_core:steel_ingot'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sword_gold', + recipe = { + {'mcl_core:gold_ingot'}, + {'mcl_core:gold_ingot'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sword_diamond', + recipe = { + {'mcl_core:diamond'}, + {'mcl_core:diamond'}, + {'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + type = 'shapeless', + output = 'mcl_core:flint_and_steel', + recipe = { 'mcl_core:steel_ingot', 'mcl_core:flint'}, +}) + +minetest.register_craft({ + output = 'mcl_core:shears', + recipe = { + { 'mcl_core:steel_ingot', '' }, + { '', 'mcl_core:steel_ingot', }, + } +}) +minetest.register_craft({ + output = 'mcl_core:shears', + recipe = { + { '', 'mcl_core:steel_ingot', }, + { 'mcl_core:steel_ingot', '' }, + } +}) + +minetest.register_craft({ + output = "mcl_core:fishing_rod", + recipe = { + {'','','mcl_core:stick'}, + {'','mcl_core:stick','mcl_core:string'}, + {'mcl_core:stick','','mcl_core:string'}, + } +}) +minetest.register_craft({ + output = "mcl_core:fishing_rod", + recipe = { + {'mcl_core:stick', '', ''}, + {'mcl_core:string', 'mcl_core:stick', ''}, + {'mcl_core:string','','mcl_core:stick'}, + } +}) + + + +minetest.register_craft({ + output = 'mcl_core:rail 16', + recipe = { + {'mcl_core:steel_ingot', '', 'mcl_core:steel_ingot'}, + {'mcl_core:steel_ingot', 'mcl_core:stick', 'mcl_core:steel_ingot'}, + {'mcl_core:steel_ingot', '', 'mcl_core:steel_ingot'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:haybale', + recipe = { + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, + } +}) + +minetest.register_craft({ + output = 'mcl_farming:wheat_harvested 9', + recipe = { + {'mcl_core:haybale'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sea_lantern', + recipe = { + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_cry', 'mcl_core:prismarine_shard'}, + {'mcl_core:prismarine_cry', 'mcl_core:prismarine_cry', 'mcl_core:prismarine_cry'}, + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_cry', 'mcl_core:prismarine_shard'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:prismarine', + recipe = { + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'}, + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:prismarine_brick', + recipe = { + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'}, + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'}, + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:prismarine_dark', + recipe = { + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'}, + {'mcl_core:prismarine_shard', 'mcl_dye:black', 'mcl_core:prismarine_shard'}, + {'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard', 'mcl_core:prismarine_shard'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:coalblock', + recipe = { + {'mcl_core:coal_lump', 'mcl_core:coal_lump', 'mcl_core:coal_lump'}, + {'mcl_core:coal_lump', 'mcl_core:coal_lump', 'mcl_core:coal_lump'}, + {'mcl_core:coal_lump', 'mcl_core:coal_lump', 'mcl_core:coal_lump'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:coal_lump 9', + recipe = { + {'mcl_core:coalblock'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:steelblock', + recipe = { + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'}, + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'}, + {'mcl_core:steel_ingot', 'mcl_core:steel_ingot', 'mcl_core:steel_ingot'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:steel_ingot 9', + recipe = { + {'mcl_core:steelblock'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:goldblock', + recipe = { + {'mcl_core:gold_ingot', 'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, + {'mcl_core:gold_ingot', 'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, + {'mcl_core:gold_ingot', 'mcl_core:gold_ingot', 'mcl_core:gold_ingot'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:gold_ingot 9', + recipe = { + {'mcl_core:goldblock'}, + } +}) + +minetest.register_craft({ + output = "mcl_core:gold_nugget 9", + recipe = {{"mcl_core:gold_ingot"}}, +}) + +minetest.register_craft({ + output = "mcl_core:iron_nugget 9", + recipe = {{"mcl_core:steel_ingot"}}, +}) + +minetest.register_craft({ + output = "mcl_core:gold_ingot", + recipe = { + {"mcl_core:gold_nugget", "mcl_core:gold_nugget", "mcl_core:gold_nugget"}, + {"mcl_core:gold_nugget", "mcl_core:gold_nugget", "mcl_core:gold_nugget"}, + {"mcl_core:gold_nugget", "mcl_core:gold_nugget", "mcl_core:gold_nugget"}, + } +}) + +minetest.register_craft({ + output = "mcl_core:steel_ingot", + recipe = { + {"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"}, + {"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"}, + {"mcl_core:iron_nugget", "mcl_core:iron_nugget", "mcl_core:iron_nugget"}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:sandstone', + recipe = { + {'mcl_core:sand', 'mcl_core:sand'}, + {'mcl_core:sand', 'mcl_core:sand'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:redsandstone', + recipe = { + {'mcl_core:redsand', 'mcl_core:redsand'}, + {'mcl_core:redsand', 'mcl_core:redsand'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:clay', + recipe = { + {'mcl_core:clay_lump', 'mcl_core:clay_lump'}, + {'mcl_core:clay_lump', 'mcl_core:clay_lump'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:brick', + recipe = { + {'mcl_core:clay_brick', 'mcl_core:clay_brick'}, + {'mcl_core:clay_brick', 'mcl_core:clay_brick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:paper 3', + recipe = { + {'mcl_core:reeds', 'mcl_core:reeds', 'mcl_core:reeds'}, + } +}) + +minetest.register_craft({ + type = 'shapeless', + output = 'mcl_core:book', + recipe = { 'mcl_core:paper', 'mcl_core:paper', 'mcl_core:paper', 'mcl_mobitems:leather', + } +}) + +minetest.register_craft({ + output = 'mcl_core:bookshelf', + recipe = { + {'group:wood', 'group:wood', 'group:wood'}, + {'mcl_core:book', 'mcl_core:book', 'mcl_core:book'}, + {'group:wood', 'group:wood', 'group:wood'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:ladder 3', + recipe = { + {'mcl_core:stick', '', 'mcl_core:stick'}, + {'mcl_core:stick', 'mcl_core:stick', 'mcl_core:stick'}, + {'mcl_core:stick', '', 'mcl_core:stick'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:stonebrick 4', + recipe = { + {'mcl_core:stone', 'mcl_core:stone'}, + {'mcl_core:stone', 'mcl_core:stone'}, + } +}) + +-- TODO: Remove recipe when mobs are working +minetest.register_craft({ + type = "shapeless", + output = "mcl_core:gunpowder", + recipe = { + 'mcl_core:sand', + 'mcl_core:gravel', + } +}) + +minetest.register_craft({ + output = 'mcl_core:lapisblock', + recipe = { + {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, + {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, + {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, + } +}) + +minetest.register_craft({ + output = 'mcl_dye:blue 9', + recipe = { + {'mcl_core:lapisblock'}, + } +}) + +minetest.register_craft({ + output = "mcl_core:emeraldblock", + recipe = { + {'mcl_core:emerald', 'mcl_core:emerald', 'mcl_core:emerald'}, + {'mcl_core:emerald', 'mcl_core:emerald', 'mcl_core:emerald'}, + {'mcl_core:emerald', 'mcl_core:emerald', 'mcl_core:emerald'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:emerald 9', + recipe = { + {'mcl_core:emeraldblock'}, + } +}) + +minetest.register_craft({ + output = "mcl_core:diamondblock", + recipe = { + {'mcl_core:diamond', 'mcl_core:diamond', 'mcl_core:diamond'}, + {'mcl_core:diamond', 'mcl_core:diamond', 'mcl_core:diamond'}, + {'mcl_core:diamond', 'mcl_core:diamond', 'mcl_core:diamond'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:diamond 9', + recipe = { + {'mcl_core:diamondblock'}, + } +}) + +minetest.register_craft({ + output = "mcl_core:glowstone", + recipe = { + {'mcl_core:glowstone_dust', 'mcl_core:glowstone_dust'}, + {'mcl_core:glowstone_dust', 'mcl_core:glowstone_dust'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:glowstone_dust 4', + recipe = { + {'mcl_core:glowstone'}, + } +}) + +minetest.register_craft({ + output = "mcl_core:apple_gold", + recipe = { + {"mcl_core:gold_ingot", "mcl_core:gold_ingot", "mcl_core:gold_ingot"}, + {"mcl_core:gold_ingot", 'mcl_core:apple', "mcl_core:gold_ingot"}, + {"mcl_core:gold_ingot", "mcl_core:gold_ingot", "mcl_core:gold_ingot"}, + } +}) + +minetest.register_craft({ + output = "mcl_core:sugar", + recipe = { + {"mcl_core:reeds"}, + } +}) + +minetest.register_craft({ + output = "mcl_core:bowl 4", + recipe = { + {"group:wood", "", "group:wood"}, + {"", "group:wood", ""}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:snowblock', + recipe = { + {'mcl_throwing:snowball', 'mcl_throwing:snowball'}, + {'mcl_throwing:snowball', 'mcl_throwing:snowball'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:snow 6', + recipe = { + {'mcl_core:snowblock', 'mcl_core:snowblock', 'mcl_core:snowblock'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:quartz_block', + recipe = { + {'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal'}, + {'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:quartz_chiseled 2', + recipe = { + {'stairs:slab_quartzblock'}, + {'stairs:slab_quartzblock'}, + } +}) + +minetest.register_craft({ + output = 'mcl_core:quartz_pillar 2', + recipe = { + {'mcl_core:quartz_block'}, + {'mcl_core:quartz_block'}, + } +}) + + +-- +-- Crafting (tool repair) +-- +minetest.register_craft({ + type = "toolrepair", + additional_wear = -0.05, +}) + +-- +-- Cooking recipes +-- + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:glass", + recipe = "group:sand", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:stone", + recipe = "mcl_core:cobble", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:stonebrickcracked", + recipe = "mcl_core:stonebrick", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:steel_ingot", + recipe = "mcl_core:stone_with_iron", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:gold_ingot", + recipe = "mcl_core:stone_with_gold", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:quartz_crystal", + recipe = "mcl_core:quartz_ore", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:clay_brick", + recipe = "mcl_core:clay_lump", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:fish", + recipe = "mcl_core:fish_raw", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:charcoal_lump", + recipe = "group:tree", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:sponge", + recipe = "mcl_core:sponge_wet", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:coal_lump", + recipe = "mcl_core:stone_with_coal", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:diamond", + recipe = "mcl_core:stone_with_diamond", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:emerald", + recipe = "mcl_core:stone_with_emerald", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_dye:blue", + recipe = "mcl_core:stone_with_lapis", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:gold_nugget", + recipe = "mcl_core:sword_gold", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:gold_nugget", + recipe = "mcl_core:axe_gold", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:gold_nugget", + recipe = "mcl_core:shovel_gold", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:gold_nugget", + recipe = "mcl_core:pick_gold", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:iron_nugget", + recipe = "mcl_core:sword_steel", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:iron_nugget", + recipe = "mcl_core:axe_steel", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:iron_nugget", + recipe = "mcl_core:shovel_steel", + cooktime = 10, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_core:iron_nugget", + recipe = "mcl_core:pick_steel", + cooktime = 10, +}) + + + +-- +-- Fuels +-- + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:coalblock", + burntime = 800, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:coal_lump", + burntime = 80, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:charcoal_lump", + burntime = 80, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "group:tree", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:bookshelf", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:ladder", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "group:wood", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:fishing_rod", + burntime = 15, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:pick_wood", + burntime = 10, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:shovel_wood", + burntime = 10, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:sword_wood", + burntime = 10, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:axe_wood", + burntime = 10, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "group:sapling", + burntime = 5, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:bowl", + burntime = 5, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mcl_core:stick", + burntime = 5, +}) + +-- +--Temporary +-- TODO: Remove when string is ready +minetest.register_craft({ + output = "mcl_core:string", + recipe = {{"mcl_core:paper",}, + {"mcl_core:paper"}}, +}) diff --git a/mods/default/craftitems.lua b/mods/mcl_core/craftitems.lua similarity index 71% rename from mods/default/craftitems.lua rename to mods/mcl_core/craftitems.lua index d5129c8396..4f826596d2 100644 --- a/mods/default/craftitems.lua +++ b/mods/mcl_core/craftitems.lua @@ -4,28 +4,28 @@ -- Crafting items -- -minetest.register_craftitem("default:stick", { +minetest.register_craftitem("mcl_core:stick", { description = "Stick", inventory_image = "default_stick.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:paper", { +minetest.register_craftitem("mcl_core:paper", { description = "Paper", inventory_image = "default_paper.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:book", { +minetest.register_craftitem("mcl_core:book", { description = "Book", inventory_image = "default_book.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:coal_lump", { +minetest.register_craftitem("mcl_core:coal_lump", { description = "Coal", groups = { coal=1 }, inventory_image = "default_coal_lump.png", @@ -33,7 +33,7 @@ minetest.register_craftitem("default:coal_lump", { groups = { craftitem=1 }, }) -minetest.register_craftitem("default:charcoal_lump", { +minetest.register_craftitem("mcl_core:charcoal_lump", { description = "Charcoal", groups = { coal=1 }, inventory_image = "default_charcoal_lump.png", @@ -41,91 +41,91 @@ minetest.register_craftitem("default:charcoal_lump", { groups = { craftitem=1 }, }) -minetest.register_craftitem("default:iron_nugget", { +minetest.register_craftitem("mcl_core:iron_nugget", { description = "Iron Nugget", inventory_image = "default_iron_nugget.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:gold_nugget", { +minetest.register_craftitem("mcl_core:gold_nugget", { description = "Gold Nugget", inventory_image = "default_gold_nugget.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:diamond", { +minetest.register_craftitem("mcl_core:diamond", { description = "Diamond", inventory_image = "default_diamond.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:clay_lump", { +minetest.register_craftitem("mcl_core:clay_lump", { description = "Clay", inventory_image = "default_clay_lump.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:steel_ingot", { +minetest.register_craftitem("mcl_core:steel_ingot", { description = "Iron Ingot", inventory_image = "default_steel_ingot.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:gold_ingot", { +minetest.register_craftitem("mcl_core:gold_ingot", { description = "Gold Ingot", inventory_image = "default_gold_ingot.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:emerald", { +minetest.register_craftitem("mcl_core:emerald", { description = "Emerald", inventory_image = "default_emerald.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:clay_brick", { +minetest.register_craftitem("mcl_core:clay_brick", { description = "Brick", inventory_image = "default_clay_brick.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:flint", { +minetest.register_craftitem("mcl_core:flint", { description = "Flint", inventory_image = "default_flint.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:gunpowder", { +minetest.register_craftitem("mcl_core:gunpowder", { description = "Gunpowder", inventory_image = "default_gunpowder.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:bone", { +minetest.register_craftitem("mcl_core:bone", { description = "Bone", inventory_image = "default_bone.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:glowstone_dust", { +minetest.register_craftitem("mcl_core:glowstone_dust", { description = "Glowstone Dust", inventory_image = "default_glowstone_dust.png", stack_max = 64, groups = { craftitem=1 }, }) -minetest.register_craftitem("default:fish_raw", { +minetest.register_craftitem("mcl_core:fish_raw", { description = "Raw Fish", inventory_image = "default_fish.png", on_use = minetest.item_eat(2), @@ -133,7 +133,7 @@ minetest.register_craftitem("default:fish_raw", { groups = { food=1, eatable = 2 }, }) -minetest.register_craftitem("default:fish", { +minetest.register_craftitem("mcl_core:fish", { description = "Cooked Fish", inventory_image = "default_fish_cooked.png", on_use = minetest.item_eat(4), @@ -141,35 +141,35 @@ minetest.register_craftitem("default:fish", { groups = { food=1, eatable=4 }, }) -minetest.register_craftitem("default:sugar", { +minetest.register_craftitem("mcl_core:sugar", { description = "Sugar", inventory_image = "default_sugar.png", stack_max = 64, groups = { craftitem = 1 }, }) -minetest.register_craftitem("default:string",{ +minetest.register_craftitem("mcl_core:string",{ description = "String", inventory_image = "default_string.png", stack_max = 64, groups = { craftitem = 1 }, }) -minetest.register_craftitem("default:bowl",{ +minetest.register_craftitem("mcl_core:bowl",{ description = "Bowl", inventory_image = "default_bowl.png", stack_max = 64, groups = { craftitem = 1 }, }) -minetest.register_craftitem("default:prismarine_cry", { +minetest.register_craftitem("mcl_core:prismarine_cry", { description = "Prismarine Crystals", inventory_image = "default_prismarine_crystals.png", stack_max = 64, groups = { craftitem = 1 }, }) -minetest.register_craftitem("default:prismarine_shard", { +minetest.register_craftitem("mcl_core:prismarine_shard", { description = "Prismarine Shard", inventory_image = "default_prismarine_shard.png", stack_max = 64, @@ -177,7 +177,7 @@ minetest.register_craftitem("default:prismarine_shard", { groups = { craftitem=1 }, }) -minetest.register_craftitem("default:quartz_crystal", { +minetest.register_craftitem("mcl_core:quartz_crystal", { description = "Nether Quartz", inventory_image = "default_quartz_crystal.png", stack_max = 64, @@ -185,7 +185,7 @@ minetest.register_craftitem("default:quartz_crystal", { groups = { craftitem=1 }, }) -minetest.register_craftitem("default:apple", { +minetest.register_craftitem("mcl_core:apple", { description = "Apple", wield_image = "default_apple.png", inventory_image = "default_apple.png", @@ -194,7 +194,7 @@ minetest.register_craftitem("default:apple", { groups = { food = 2 }, }) -minetest.register_craftitem("default:apple_gold", { +minetest.register_craftitem("mcl_core:apple_gold", { description = core.colorize("#55FFFF", "Golden Apple"), wield_image = "default_apple_gold.png", inventory_image = "default_apple_gold.png", @@ -203,4 +203,4 @@ minetest.register_craftitem("default:apple_gold", { groups = { food = 2 }, }) -minetest.register_alias("default:iron_ingot", "default:steel_ingot") +minetest.register_alias("mcl_core:iron_ingot", "mcl_core:steel_ingot") diff --git a/mods/default/functions.lua b/mods/mcl_core/functions.lua similarity index 78% rename from mods/default/functions.lua rename to mods/mcl_core/functions.lua index d7795b87a7..0837f2348b 100644 --- a/mods/default/functions.lua +++ b/mods/mcl_core/functions.lua @@ -2,31 +2,31 @@ -- Lavacooling -- -default.cool_lava_source = function(pos) - minetest.set_node(pos, {name="default:obsidian"}) +mcl_core.cool_lava_source = function(pos) + minetest.set_node(pos, {name="mcl_core:obsidian"}) end -default.cool_lava_flowing = function(pos) - minetest.set_node(pos, {name="default:stone"}) +mcl_core.cool_lava_flowing = function(pos) + minetest.set_node(pos, {name="mcl_core:stone"}) end minetest.register_abm({ - nodenames = {"default:lava_flowing"}, + nodenames = {"mcl_core:lava_flowing"}, neighbors = {"group:water"}, interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - default.cool_lava_flowing(pos, node, active_object_count, active_object_count_wider) + mcl_core.cool_lava_flowing(pos, node, active_object_count, active_object_count_wider) end, }) minetest.register_abm({ - nodenames = {"default:lava_source"}, + nodenames = {"mcl_core:lava_source"}, neighbors = {"group:water"}, interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - default.cool_lava_source(pos, node, active_object_count, active_object_count_wider) + mcl_core.cool_lava_source(pos, node, active_object_count, active_object_count_wider) end, }) @@ -41,13 +41,13 @@ local grow_cactus = function(pos, node) if minetest.get_item_group(name, "sand") ~= 0 then pos.y = pos.y+1 local height = 0 - while minetest.get_node(pos).name == "default:cactus" and height < 4 do + while minetest.get_node(pos).name == "mcl_core:cactus" and height < 4 do height = height+1 pos.y = pos.y+1 end if height < 3 then if minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name="default:cactus"}) + minetest.set_node(pos, {name="mcl_core:cactus"}) end end end @@ -62,13 +62,13 @@ local grow_reeds = function(pos, node) end pos.y = pos.y+1 local height = 0 - while minetest.get_node(pos).name == "default:reeds" and height < 3 do + while minetest.get_node(pos).name == "mcl_core:reeds" and height < 3 do height = height+1 pos.y = pos.y+1 end if height < 3 then if minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name="default:reeds"}) + minetest.set_node(pos, {name="mcl_core:reeds"}) end end end @@ -101,7 +101,7 @@ minetest.register_abm({ for zp=-1,1 do local p = {x=pos.x+xp, y=pos.y, z=pos.z+zp} local n = minetest.get_node(p) - if (n.name=="default:water_flowing") then + if (n.name=="mcl_core:water_flowing") then drop_attached_node(pos) minetest.dig_node(pos) break @@ -111,7 +111,7 @@ minetest.register_abm({ for yp=-1,1 do local p = {x=pos.x, y=pos.y+yp, z=pos.z} local n = minetest.get_node(p) - if (n.name=="default:water_flowing") then + if (n.name=="mcl_core:water_flowing") then drop_attached_node(pos) minetest.dig_node(pos) break @@ -122,7 +122,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"default:cactus"}, + nodenames = {"mcl_core:cactus"}, neighbors = {"group:sand"}, interval = 25, chance = 10, @@ -132,8 +132,8 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"default:reeds"}, - neighbors = {"default:dirt", "default:dirt_with_grass"}, + nodenames = {"mcl_core:reeds"}, + neighbors = {"mcl_core:dirt", "mcl_core:dirt_with_grass"}, interval = 25, chance = 10, action = function(pos) @@ -145,7 +145,7 @@ minetest.register_abm({ -- Papyrus and cactus drop -- -local timber_nodenames={"default:reeds", "default:cactus"} +local timber_nodenames={"mcl_core:reeds", "mcl_core:cactus"} minetest.register_on_dignode(function(pos, node) local i=1 @@ -166,7 +166,7 @@ end) -- Flint and Steel -- -function default.set_fire(pointed_thing) +function mcl_core.set_fire(pointed_thing) local n = minetest.get_node(pointed_thing.above) if n.name ~= "" and n.name == "air" and not minetest.is_protected(pointed_thing.above, "fire") then minetest.add_node(pointed_thing.above, {name="fire:basic_flame"}) @@ -177,7 +177,7 @@ end -- Fire Particles -- -function default.add_fire(pos) +function mcl_core.add_fire(pos) local null = {x=0, y=0, z=0} pos.y = pos.y+0.19 minetest.add_particle(pos, null, null, 1.1, @@ -197,9 +197,9 @@ local pos local function apple_leave() if math.random(0, 10) == 3 then - return {name = "default:apple"} + return {name = "mcl_core:apple"} else - return {name = "default:leaves"} + return {name = "mcl_core:leaves"} end end @@ -207,7 +207,7 @@ local function air_leave() if math.random(0, 50) == 3 then return {name = "air"} else - return {name = "default:leaves"} + return {name = "mcl_core:leaves"} end end @@ -314,14 +314,14 @@ local function generate_tree(pos, trunk, leaves, typearbre) for dz=0,1 do pos.z = pos.z + dz --> 0 - if minetest.get_node(pos).name == "default:dirt_with_grass" - or minetest.get_node(pos).name == "default:dirt" then else + if minetest.get_node(pos).name == "mcl_core:dirt_with_grass" + or minetest.get_node(pos).name == "mcl_core:dirt" then else return end pos.x = pos.x+1 --> 1 - if minetest.get_node(pos).name == "default:dirt_with_grass" - or minetest.get_node(pos).name == "default:dirt" then else + if minetest.get_node(pos).name == "mcl_core:dirt_with_grass" + or minetest.get_node(pos).name == "mcl_core:dirt" then else return end pos.x = pos.x-1 @@ -339,22 +339,22 @@ local function generate_tree(pos, trunk, leaves, typearbre) if dz == -1 then pos.z = pos.z + dz if math.random(1, 3) == 1 and minetest.get_node(pos).name == "air" then - minetest.add_node(pos, {name = "default:vine", param2 = 4}) + minetest.add_node(pos, {name = "mcl_core:vine", param2 = 4}) end pos.x = pos.x+1 if math.random(1, 3) == 1 and minetest.get_node(pos).name == "air" then - minetest.add_node(pos, {name = "default:vine", param2 = 4}) + minetest.add_node(pos, {name = "mcl_core:vine", param2 = 4}) end pos.x = pos.x-1 pos.z = pos.z - dz elseif dz == 2 then pos.z = pos.z + dz if math.random(1, 3) == 1 and minetest.get_node(pos).name == "air"then - minetest.add_node(pos, {name = "default:vine", param2 = 5}) + minetest.add_node(pos, {name = "mcl_core:vine", param2 = 5}) end pos.x = pos.x+1 if math.random(1, 3) == 1 and minetest.get_node(pos).name == "air" then - minetest.add_node(pos, {name = "default:vine", param2 = 5}) + minetest.add_node(pos, {name = "mcl_core:vine", param2 = 5}) end pos.x = pos.x-1 pos.z = pos.z - dz @@ -362,7 +362,7 @@ local function generate_tree(pos, trunk, leaves, typearbre) pos.z = pos.z + dz pos.x = pos.x-1 if math.random(1, 3) == 1 and minetest.get_node(pos).name == "air" then - minetest.add_node(pos, {name = "default:vine", param2 = 2}) + minetest.add_node(pos, {name = "mcl_core:vine", param2 = 2}) end pos.x = pos.x+1 if minetest.get_node(pos).name == "air" then @@ -374,7 +374,7 @@ local function generate_tree(pos, trunk, leaves, typearbre) end pos.x = pos.x+1 if math.random(1, 3) == 1 and minetest.get_node(pos).name == "air" then - minetest.add_node(pos, {name = "default:vine", param2 = 3}) + minetest.add_node(pos, {name = "mcl_core:vine", param2 = 3}) end pos.x = pos.x-2 pos.z = pos.z - dz @@ -395,21 +395,21 @@ local function generate_tree(pos, trunk, leaves, typearbre) pos.z = pos.z+dz if dx == 0 and dz == 0 and dy==3 then - if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "default:vine" and math.random(1, 2) == 1 then + if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "mcl_core:vine" and math.random(1, 2) == 1 then minetest.add_node(pos, node) end elseif dx == 0 and dz == 0 and dy==4 then - if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "default:vine" and math.random(1, 5) == 1 then + if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "mcl_core:vine" and math.random(1, 5) == 1 then minetest.add_node(pos, node) minetest.add_node(pos, air_leave()) end elseif math.abs(dx) ~= 2 and math.abs(dz) ~= 2 then - if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "default:vine" then + if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "mcl_core:vine" then minetest.add_node(pos, node) end else if math.abs(dx) ~= 2 or math.abs(dz) ~= 2 then - if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "default:vine" and math.random(1, 3) == 1 then + if minetest.get_node(pos).name == "air" or minetest.get_node(pos).name == "mcl_core:vine" and math.random(1, 3) == 1 then minetest.add_node(pos, node) end else @@ -431,37 +431,36 @@ local plant_tab = {} local rnd_max = 5 minetest.after(0.5, function() plant_tab[0] = "air" - plant_tab[1] = "default:grass" - plant_tab[2] = "default:grass" - plant_tab[3] = "default:grass" - plant_tab[4] = "default:grass" - plant_tab[5] = "default:grass" + plant_tab[1] = "mcl_core:grass" + plant_tab[2] = "mcl_core:grass" + plant_tab[3] = "mcl_core:grass" + plant_tab[4] = "mcl_core:grass" + plant_tab[5] = "mcl_core:grass" if minetest.get_modpath("mcl_flowers") ~= nil then - rnd_max = 16 - plant_tab[6] = "mcl_flowers:dandelion_yellow" - plant_tab[7] = "mcl_flowers:rose" + rnd_max = 15 + plant_tab[6] = "mcl_flowers:dandelion" + plant_tab[7] = "mcl_flowers:blue_orchid" plant_tab[8] = "mcl_flowers:oxeye_daisy" plant_tab[9] = "mcl_flowers:tulip_orange" plant_tab[10] = "mcl_flowers:tulip_red" plant_tab[11] = "mcl_flowers:tulip_white" plant_tab[12] = "mcl_flowers:tulip_pink" plant_tab[13] = "mcl_flowers:allium" - plant_tab[14] = "mcl_flowers:paeonia" - plant_tab[15] = "mcl_flowers:houstonia" - plant_tab[16] = "mcl_flowers:blue_orchid" + plant_tab[14] = "mcl_flowers:poppy" + plant_tab[15] = "mcl_flowers:azure_bluet" end end) -function default.duengen(pointed_thing) +function mcl_core.duengen(pointed_thing) pos = pointed_thing.under n = minetest.get_node(pos) if n.name == "" then return false end local stage = "" - if n.name == "default:sapling" then + if n.name == "mcl_core:sapling" then minetest.add_node(pos, {name="air"}) - generate_tree(pos, "default:tree", "default:leaves", 1) + generate_tree(pos, "mcl_core:tree", "mcl_core:leaves", 1) return true elseif string.find(n.name, "mcl_farming:wheat_") ~= nil then stage = string.sub(n.name, 15) @@ -505,17 +504,17 @@ function default.duengen(pointed_thing) minetest.add_node(pos, {name="mcl_farming:melontige_unconnect"}) end return true - elseif n.name ~= "" and n.name == "default:junglesapling" then + elseif n.name ~= "" and n.name == "mcl_core:junglesapling" then minetest.add_node(pos, {name="air"}) - generate_tree(pos, "default:jungletree", "default:jungleleaves", 2) + generate_tree(pos, "mcl_core:jungletree", "mcl_core:jungleleaves", 2) return true - elseif n.name ~="" and n.name == "default:reeds" then + elseif n.name ~="" and n.name == "mcl_core:reeds" then grow_reeds(pos) return true - elseif n.name ~="" and n.name == "default:cactus" then + elseif n.name ~="" and n.name == "mcl_core:cactus" then grow_cactus(pos) return true - elseif n.name == "default:dirt_with_grass" then + elseif n.name == "mcl_core:dirt_with_grass" then for i = -2, 3, 1 do for j = -3, 2, 1 do pos = pointed_thing.above @@ -523,7 +522,7 @@ function default.duengen(pointed_thing) n = minetest.get_node(pos) n2 = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}) - if n.name ~= "" and n.name == "air" and n2.name == "default:dirt_with_grass" then + if n.name ~= "" and n.name == "air" and n2.name == "mcl_core:dirt_with_grass" then if math.random(0,5) > 3 then minetest.add_node(pos, {name=plant_tab[math.random(0, rnd_max)]}) else @@ -545,7 +544,7 @@ end ------------------------------ -- turn dirt to dirt with grass minetest.register_abm({ - nodenames = {"default:dirt"}, + nodenames = {"mcl_core:dirt"}, neighbors = {"air"}, interval = 30, chance = 20, @@ -565,7 +564,7 @@ minetest.register_abm({ if can_change > 3 then local light = minetest.get_node_light(pos) if light or light > 10 then - minetest.add_node(pos, {name="default:dirt_with_grass"}) + minetest.add_node(pos, {name="mcl_core:dirt_with_grass"}) end end @@ -581,7 +580,7 @@ minetest.register_abm({ -- Normal tree minetest.register_abm({ - nodenames = {"default:sapling"}, + nodenames = {"mcl_core:sapling"}, neighbors = {"group:soil_sapling"}, interval = 30, chance = 15, @@ -591,14 +590,14 @@ minetest.register_abm({ local soiltype = minetest.get_item_group(soilnode.name, "soil_sapling") if soiltype >= 1 and light and light >= 9 then minetest.add_node(pos, {name="air"}) - generate_tree(pos, "default:tree", "default:leaves", 1) + generate_tree(pos, "mcl_core:tree", "mcl_core:leaves", 1) end end, }) -- Jungle Tree minetest.register_abm({ - nodenames = {"default:junglesapling"}, + nodenames = {"mcl_core:junglesapling"}, neighbors = {"group:soil_sapling"}, interval = 30, chance = 15, @@ -608,7 +607,7 @@ minetest.register_abm({ local soiltype = minetest.get_item_group(soilnode.name, "soil_sapling") if soiltype == 2 and light and light >= 9 then minetest.add_node(pos, {name="air"}) - generate_tree(pos, "default:jungletree", "default:jungleleaves", 2) + generate_tree(pos, "mcl_core:jungletree", "mcl_core:jungleleaves", 2) end end, }) @@ -617,7 +616,7 @@ minetest.register_abm({ -- Vine generating -- --------------------- minetest.register_abm({ - nodenames = {"default:vine"}, + nodenames = {"mcl_core:vine"}, interval = 80, chance = 5, action = function(pos, node, active_object_count, active_object_count_wider) @@ -625,7 +624,7 @@ minetest.register_abm({ local n = minetest.get_node(newpos) if n.name == "air" then local walldir = node.param2 - minetest.add_node(newpos, {name = "default:vine", param2 = walldir}) + minetest.add_node(newpos, {name = "mcl_core:vine", param2 = walldir}) end end }) @@ -635,7 +634,7 @@ minetest.register_abm({ -- Sounds -- -function default.node_sound_defaults(table) +function mcl_core.node_sound_defaults(table) table = table or {} table.footstep = table.footstep or {name="", gain=1.0} @@ -646,20 +645,20 @@ function default.node_sound_defaults(table) return table end -function default.node_sound_stone_defaults(table) +function mcl_core.node_sound_stone_defaults(table) table = table or {} table.footstep = table.footstep or {name="default_hard_footstep", gain=0.5} table.dug = table.dug or {name="default_hard_footstep", gain=1.0} - default.node_sound_defaults(table) + mcl_core.node_sound_defaults(table) return table end -- TODO: Maybe add custom metal sounds -default.node_sound_metal_defaults = default.node_sound_stone_defaults +mcl_core.node_sound_metal_defaults = mcl_core.node_sound_stone_defaults -function default.node_sound_dirt_defaults(table) +function mcl_core.node_sound_dirt_defaults(table) table = table or {} table.footstep = table.footstep or {name="default_dirt_footstep", gain=1.0} @@ -667,11 +666,11 @@ function default.node_sound_dirt_defaults(table) {name="default_dirt_footstep", gain=1.5} table.place = table.place or {name="default_place_node", gain=1.0} - default.node_sound_defaults(table) + mcl_core.node_sound_defaults(table) return table end -function default.node_sound_sand_defaults(table) +function mcl_core.node_sound_sand_defaults(table) table = table or {} table.footstep = table.footstep or {name="default_sand_footstep", gain=0.5} @@ -679,21 +678,21 @@ function default.node_sound_sand_defaults(table) {name="default_sand_footstep", gain=1.0} table.place = table.place or {name="default_place_node", gain=1.0} - default.node_sound_defaults(table) + mcl_core.node_sound_defaults(table) return table end -function default.node_sound_wood_defaults(table) +function mcl_core.node_sound_wood_defaults(table) table = table or {} table.footstep = table.footstep or {name="default_wood_footstep", gain=0.5} table.dug = table.dug or {name="default_wood_footstep", gain=1.0} - default.node_sound_defaults(table) + mcl_core.node_sound_defaults(table) return table end -function default.node_sound_leaves_defaults(table) +function mcl_core.node_sound_leaves_defaults(table) table = table or {} table.footstep = table.footstep or {name="default_grass_footstep", gain=0.35} @@ -703,17 +702,17 @@ function default.node_sound_leaves_defaults(table) {name="default_dig_crumbly", gain=0.4} table.place = table.place or {name="default_place_node", gain=1.0} - default.node_sound_defaults(table) + mcl_core.node_sound_defaults(table) return table end -function default.node_sound_glass_defaults(table) +function mcl_core.node_sound_glass_defaults(table) table = table or {} table.footstep = table.footstep or {name="default_glass_footstep", gain=0.5} table.dug = table.dug or {name="default_break_glass", gain=1.0} - default.node_sound_defaults(table) + mcl_core.node_sound_defaults(table) return table end @@ -730,14 +729,14 @@ end -- If the node is in the leafdecay_drop group then the it will always be dropped -- as an item -default.leafdecay_trunk_cache = {} -default.leafdecay_enable_cache = true +mcl_core.leafdecay_trunk_cache = {} +mcl_core.leafdecay_enable_cache = true -- Spread the load of finding trunks -default.leafdecay_trunk_find_allow_accumulator = 0 +mcl_core.leafdecay_trunk_find_allow_accumulator = 0 minetest.register_globalstep(function(dtime) local finds_per_second = 5000 - default.leafdecay_trunk_find_allow_accumulator = + mcl_core.leafdecay_trunk_find_allow_accumulator = math.floor(dtime * finds_per_second) end) @@ -762,9 +761,9 @@ minetest.register_abm({ return end local p0_hash = nil - if default.leafdecay_enable_cache then + if mcl_core.leafdecay_enable_cache then p0_hash = minetest.hash_node_position(p0) - local trunkp = default.leafdecay_trunk_cache[p0_hash] + local trunkp = mcl_core.leafdecay_trunk_cache[p0_hash] if trunkp then local n = minetest.get_node(trunkp) local reg = minetest.registered_nodes[n.name] @@ -775,22 +774,22 @@ minetest.register_abm({ end --print("cached trunk is invalid") -- Cache is invalid - table.remove(default.leafdecay_trunk_cache, p0_hash) + table.remove(mcl_core.leafdecay_trunk_cache, p0_hash) end end - if default.leafdecay_trunk_find_allow_accumulator <= 0 then + if mcl_core.leafdecay_trunk_find_allow_accumulator <= 0 then return end - default.leafdecay_trunk_find_allow_accumulator = - default.leafdecay_trunk_find_allow_accumulator - 1 + mcl_core.leafdecay_trunk_find_allow_accumulator = + mcl_core.leafdecay_trunk_find_allow_accumulator - 1 -- Assume ignore is a trunk, to make the thing work at the border of the active area local p1 = minetest.find_node_near(p0, d, {"ignore", "group:tree"}) if p1 then do_preserve = true - if default.leafdecay_enable_cache then + if mcl_core.leafdecay_enable_cache then --print("caching trunk") -- Cache the trunk - default.leafdecay_trunk_cache[p0_hash] = p1 + mcl_core.leafdecay_trunk_cache[p0_hash] = p1 end end if not do_preserve then @@ -817,9 +816,9 @@ minetest.register_abm({ ------------------------ -- Create Color Glass -- ------------------------ -function default.add_glass(desc, recipeitem, color) +function mcl_core.add_glass(desc, recipeitem, color) - minetest.register_node("default:glass_"..color, { + minetest.register_node("mcl_core:glass_"..color, { description = desc, drawtype = "glasslike", is_ground_content = false, @@ -829,16 +828,16 @@ function default.add_glass(desc, recipeitem, color) use_texture_alpha = true, stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=3, building_block=1}, - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), drop = "", }) minetest.register_craft({ - output = 'default:glass_'..color..' 8', + output = 'mcl_core:glass_'..color..' 8', recipe = { - {'default:glass','default:glass','default:glass'}, - {'default:glass','group:dye,'..recipeitem,'default:glass'}, - {'default:glass','default:glass','default:glass'}, + {'mcl_core:glass','mcl_core:glass','mcl_core:glass'}, + {'mcl_core:glass','group:dye,'..recipeitem,'mcl_core:glass'}, + {'mcl_core:glass','mcl_core:glass','mcl_core:glass'}, } }) end diff --git a/mods/mcl_core/init.lua b/mods/mcl_core/init.lua new file mode 100644 index 0000000000..9bb436ddc1 --- /dev/null +++ b/mods/mcl_core/init.lua @@ -0,0 +1,29 @@ +-- Minetest 0.4 mod: default +-- See README.txt for licensing and other information. +-- The API documentation in here was moved into doc/lua_api.txt + +-- Definitions made by this mod that other mods can use too +mcl_core = {} +mcl_core.gui_slots = "listcolors[#9990;#FFF7;#FFF0;#000;#FFF]" +mcl_core.gui_bg = "bgcolor[#080808BB;true]" +mcl_core.gui_bg_img = "" + +mcl_core.inventory_header = mcl_core.gui_slots .. mcl_core.gui_bg + +minetest.nodedef_default.stack_max = 64 +minetest.craftitemdef_default.stack_max = 64 + +-- Load files +dofile(minetest.get_modpath("mcl_core").."/functions.lua") +dofile(minetest.get_modpath("mcl_core").."/nodes.lua") +dofile(minetest.get_modpath("mcl_core").."/tools.lua") +dofile(minetest.get_modpath("mcl_core").."/craftitems.lua") +dofile(minetest.get_modpath("mcl_core").."/crafting.lua") +dofile(minetest.get_modpath("mcl_core").."/mapgen.lua") +dofile(minetest.get_modpath("mcl_core").."/player.lua") + +-- Aliases +minetest.register_alias("default:desert_sand", "mcl_core:sand") +minetest.register_alias("default:desert_stone", "mcl_core:sandstone") +minetest.register_alias("default:iron_lump", "mcl_core:iron_lump") +minetest.register_alias("default:gold_lump", "mcl_core:gold_lump") diff --git a/mods/default/mapgen.lua b/mods/mcl_core/mapgen.lua similarity index 61% rename from mods/default/mapgen.lua rename to mods/mcl_core/mapgen.lua index 15f9f0f84c..aaabeed91e 100644 --- a/mods/default/mapgen.lua +++ b/mods/mcl_core/mapgen.lua @@ -5,38 +5,38 @@ -- minetest.register_alias("mapgen_air", "air") -minetest.register_alias("mapgen_stone", "default:stone") -minetest.register_alias("mapgen_tree", "default:tree") -minetest.register_alias("mapgen_leaves", "default:leaves") -minetest.register_alias("mapgen_jungletree", "default:jungletree") -minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves") -minetest.register_alias("mapgen_pine_tree", "default:darktree") -minetest.register_alias("mapgen_pine_needles", "default:darkleaves") +minetest.register_alias("mapgen_stone", "mcl_core:stone") +minetest.register_alias("mapgen_tree", "mcl_core:tree") +minetest.register_alias("mapgen_leaves", "mcl_core:leaves") +minetest.register_alias("mapgen_jungletree", "mcl_core:jungletree") +minetest.register_alias("mapgen_jungleleaves", "mcl_core:jungleleaves") +minetest.register_alias("mapgen_pine_tree", "mcl_core:darktree") +minetest.register_alias("mapgen_pine_needles", "mcl_core:darkleaves") -minetest.register_alias("mapgen_apple", "default:leaves") -minetest.register_alias("mapgen_water_source", "default:water_source") -minetest.register_alias("mapgen_dirt", "default:dirt") -minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") -minetest.register_alias("mapgen_dirt_with_snow", "default:dirt_with_snow") -minetest.register_alias("mapgen_sand", "default:sand") -minetest.register_alias("mapgen_gravel", "default:gravel") -minetest.register_alias("mapgen_clay", "default:clay") -minetest.register_alias("mapgen_lava_source", "default:lava_source") -minetest.register_alias("mapgen_cobble", "default:cobble") -minetest.register_alias("mapgen_mossycobble", "default:mossycobble") -minetest.register_alias("mapgen_junglegrass", "default:junglegrass") -minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal") -minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron") -minetest.register_alias("mapgen_desert_sand", "default:sand") -minetest.register_alias("mapgen_desert_stone", "default:sandstone") -minetest.register_alias("mapgen_sandstone", "default:sandstone") -minetest.register_alias("mapgen_river_water_source", "default:water_source") -minetest.register_alias("mapgen_snow", "default:snow") -minetest.register_alias("mapgen_snowblock", "default:snowblock") -minetest.register_alias("mapgen_ice", "default:ice") +minetest.register_alias("mapgen_apple", "mcl_core:leaves") +minetest.register_alias("mapgen_water_source", "mcl_core:water_source") +minetest.register_alias("mapgen_dirt", "mcl_core:dirt") +minetest.register_alias("mapgen_dirt_with_grass", "mcl_core:dirt_with_grass") +minetest.register_alias("mapgen_dirt_with_snow", "mcl_core:dirt_with_snow") +minetest.register_alias("mapgen_sand", "mcl_core:sand") +minetest.register_alias("mapgen_gravel", "mcl_core:gravel") +minetest.register_alias("mapgen_clay", "mcl_core:clay") +minetest.register_alias("mapgen_lava_source", "mcl_core:lava_source") +minetest.register_alias("mapgen_cobble", "mcl_core:cobble") +minetest.register_alias("mapgen_mossycobble", "mcl_core:mossycobble") +minetest.register_alias("mapgen_junglegrass", "mcl_core:junglegrass") +minetest.register_alias("mapgen_stone_with_coal", "mcl_core:stone_with_coal") +minetest.register_alias("mapgen_stone_with_iron", "mcl_core:stone_with_iron") +minetest.register_alias("mapgen_desert_sand", "mcl_core:sand") +minetest.register_alias("mapgen_desert_stone", "mcl_core:sandstone") +minetest.register_alias("mapgen_sandstone", "mcl_core:sandstone") +minetest.register_alias("mapgen_river_water_source", "mcl_core:water_source") +minetest.register_alias("mapgen_snow", "mcl_core:snow") +minetest.register_alias("mapgen_snowblock", "mcl_core:snowblock") +minetest.register_alias("mapgen_ice", "mcl_core:ice") minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble") -minetest.register_alias("mapgen_sandstonebrick", "default:sandstonesmooth") +minetest.register_alias("mapgen_sandstonebrick", "mcl_core:sandstonesmooth") minetest.register_alias("mapgen_stair_sandstonebrick", "stairs:stair_sandstone") -- @@ -46,8 +46,8 @@ minetest.register_alias("mapgen_stair_sandstonebrick", "stairs:stair_sandstone") -- Gravel minetest.register_ore({ ore_type = "blob", - ore = "default:gravel", - wherein = {"default:stone"}, + ore = "mcl_core:gravel", + wherein = {"mcl_core:stone"}, clust_scarcity = 14*14*14, clust_num_ores = 33, clust_size = 5, @@ -60,8 +60,8 @@ minetest.register_ore({ -- minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", + ore = "mcl_core:stone_with_coal", + wherein = "mcl_core:stone", clust_scarcity = 500, clust_num_ores = 5, clust_size = 3, @@ -70,8 +70,8 @@ minetest.register_ore({ }) minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", + ore = "mcl_core:stone_with_coal", + wherein = "mcl_core:stone", clust_scarcity = 500, clust_num_ores = 8, clust_size = 3, @@ -80,8 +80,8 @@ minetest.register_ore({ }) minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", + ore = "mcl_core:stone_with_coal", + wherein = "mcl_core:stone", clust_scarcity = 1000, clust_num_ores = 6, clust_size = 3, @@ -90,8 +90,8 @@ minetest.register_ore({ }) minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", + ore = "mcl_core:stone_with_coal", + wherein = "mcl_core:stone", clust_scarcity = 5000, clust_num_ores = 4, clust_size = 2, @@ -104,8 +104,8 @@ minetest.register_ore({ -- minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", + ore = "mcl_core:stone_with_iron", + wherein = "mcl_core:stone", clust_scarcity = 830, clust_num_ores = 5, clust_size = 3, @@ -114,8 +114,8 @@ minetest.register_ore({ }) minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", + ore = "mcl_core:stone_with_iron", + wherein = "mcl_core:stone", clust_scarcity = 1660, clust_num_ores = 3, clust_size = 2, @@ -128,8 +128,8 @@ minetest.register_ore({ -- minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", + ore = "mcl_core:stone_with_gold", + wherein = "mcl_core:stone", clust_scarcity = 5000, clust_num_ores = 5, clust_size = 3, @@ -138,8 +138,8 @@ minetest.register_ore({ }) minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", + ore = "mcl_core:stone_with_gold", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 3, clust_size = 2, @@ -152,8 +152,8 @@ minetest.register_ore({ -- minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", + ore = "mcl_core:stone_with_diamond", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 4, clust_size = 3, @@ -162,8 +162,8 @@ minetest.register_ore({ }) minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", + ore = "mcl_core:stone_with_diamond", + wherein = "mcl_core:stone", clust_scarcity = 5000, clust_num_ores = 2, clust_size = 2, @@ -172,8 +172,8 @@ minetest.register_ore({ }) minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", + ore = "mcl_core:stone_with_diamond", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 8, clust_size = 3, @@ -187,8 +187,8 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_redstone", - wherein = "default:stone", + ore = "mcl_core:stone_with_redstone", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 5, clust_size = 3, @@ -198,8 +198,8 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_redstone", - wherein = "default:stone", + ore = "mcl_core:stone_with_redstone", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 10, clust_size = 4, @@ -213,8 +213,8 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_emerald", - wherein = "default:stone", + ore = "mcl_core:stone_with_emerald", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 1, clust_size = 2, @@ -224,8 +224,8 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_emerald", - wherein = "default:stone", + ore = "mcl_core:stone_with_emerald", + wherein = "mcl_core:stone", clust_scarcity = 50000, clust_num_ores = 3, clust_size = 2, @@ -239,8 +239,8 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_lapis", - wherein = "default:stone", + ore = "mcl_core:stone_with_lapis", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 7, clust_size = 4, @@ -250,8 +250,8 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:stone_with_lapis", - wherein = "default:stone", + ore = "mcl_core:stone_with_lapis", + wherein = "mcl_core:stone", clust_scarcity = 10000, clust_num_ores = 5, clust_size = 4, @@ -266,8 +266,8 @@ minetest.register_ore({ -- minetest.register_ore({ ore_type = "scatter", - ore = "default:glowstone", - wherein = "default:stone", + ore = "mcl_core:glowstone", + wherein = "mcl_core:stone", clust_scarcity = 50000, clust_num_ores = 10, clust_size = 5, @@ -275,8 +275,8 @@ minetest.register_ore({ y_max = -0, }) -function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, y_min, y_max) - minetest.log('action', "WARNING: default.generate_ore is deprecated") +function mcl_core.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, y_min, y_max) + minetest.log('action', "WARNING: mcl_core.generate_ore is deprecated") if maxp.y < y_min or minp.y > y_max then return @@ -317,26 +317,26 @@ function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume --print("generate_ore done") end -function default.make_reeds(pos, size) +function mcl_core.make_reeds(pos, size) for y=0,size-1 do local p = {x=pos.x, y=pos.y+y, z=pos.z} local nn = minetest.get_node(p).name if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].buildable_to then - minetest.set_node(p, {name="default:reeds"}) + minetest.set_node(p, {name="mcl_core:reeds"}) else return end end end -function default.make_cactus(pos, size) +function mcl_core.make_cactus(pos, size) for y=0,size-1 do local p = {x=pos.x, y=pos.y+y, z=pos.z} local nn = minetest.get_node(p).name if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].buildable_to then - minetest.set_node(p, {name="default:cactus"}) + minetest.set_node(p, {name="mcl_core:cactus"}) else return end @@ -354,17 +354,17 @@ minetest.register_on_generated(function(minp, maxp, seed) for divz=0+1,divs-1-1 do local cx = minp.x + math.floor((divx+0.5)*divlen) local cz = minp.z + math.floor((divz+0.5)*divlen) - if minetest.get_node({x=cx,y=1,z=cz}).name == "default:water_source" and - minetest.get_node({x=cx,y=0,z=cz}).name == "default:sand" then + if minetest.get_node({x=cx,y=1,z=cz}).name == "mcl_core:water_source" and + minetest.get_node({x=cx,y=0,z=cz}).name == "mcl_core:sand" then local is_shallow = true local num_water_around = 0 - if minetest.get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then + if minetest.get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "mcl_core:water_source" then num_water_around = num_water_around + 1 end - if minetest.get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then + if minetest.get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "mcl_core:water_source" then num_water_around = num_water_around + 1 end - if minetest.get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then + if minetest.get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "mcl_core:water_source" then num_water_around = num_water_around + 1 end - if minetest.get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then + if minetest.get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "mcl_core:water_source" then num_water_around = num_water_around + 1 end if num_water_around >= 2 then is_shallow = false @@ -372,8 +372,8 @@ minetest.register_on_generated(function(minp, maxp, seed) if is_shallow then for x1=-divlen,divlen do for z1=-divlen,divlen do - if minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" or minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sandstone" then - minetest.set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"}) + if minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name == "mcl_core:sand" or minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name == "mcl_core:sandstone" then + minetest.set_node({x=cx+x1,y=0,z=cz+z1}, {name="mcl_core:clay"}) end end end @@ -399,12 +399,12 @@ minetest.register_on_generated(function(minp, maxp, seed) for i=0,reeds_amount do local x = pr:next(x0, x1) local z = pr:next(z0, z1) - if minetest.get_node({x=x,y=1,z=z}).name == "default:dirt_with_grass" and - minetest.find_node_near({x=x,y=1,z=z}, 1, "default:water_source") then - default.make_reeds({x=x,y=2,z=z}, pr:next(2, 4)) + if minetest.get_node({x=x,y=1,z=z}).name == "mcl_core:dirt_with_grass" and + minetest.find_node_near({x=x,y=1,z=z}, 1, "mcl_core:water_source") then + mcl_core.make_reeds({x=x,y=2,z=z}, pr:next(2, 4)) end local p = {x=x,y=1,z=z} - if minetest.get_node(p).name == "default:sand" then + if minetest.get_node(p).name == "mcl_core:sand" then if math.random(0,1000) == 1 then -- 0,12000 -- TODO: Re-enable random_struct --random_struct.call_struct(p,2) @@ -441,8 +441,8 @@ minetest.register_on_generated(function(minp, maxp, seed) end end -- If sand, make cactus - if ground_y and minetest.get_node({x=x,y=ground_y,z=z}).name == "default:sand" then - default.make_cactus({x=x,y=ground_y+1,z=z}, pr:next(3, 4)) + if ground_y and minetest.get_node({x=x,y=ground_y,z=z}).name == "mcl_core:sand" then + mcl_core.make_cactus({x=x,y=ground_y+1,z=z}, pr:next(3, 4)) end end end @@ -482,12 +482,12 @@ minetest.register_on_generated(function(minp, maxp, seed) minetest.registered_nodes[nn].buildable_to then nn = minetest.get_node({x=x,y=ground_y,z=z}).name -- If sand, add dry shrub - if nn == "default:sand" then - minetest.set_node(p,{name="default:dry_shrub"}) + if nn == "mcl_core:sand" then + minetest.set_node(p,{name="mcl_core:dry_shrub"}) -- If dirt with grass, add grass - elseif nn == "default:dirt_with_grass" then - minetest.set_node(p,{name="default:grass"}) + elseif nn == "mcl_core:dirt_with_grass" then + minetest.set_node(p,{name="mcl_core:grass"}) if math.random(0,12000) == 1 then -- TODO: Re-enable random_struct --random_struct.call_struct(p,1) @@ -517,24 +517,24 @@ local function replace(old, new, min, max) y_max = max, }) end -replace("air", "default:bedrock", -90, -80) -replace("air", "default:lava_source", -80, -70) -replace("default:stone", "default:bedrock", -90, -80) -replace("default:gravel", "default:bedrock", -90, -80) -replace("default:dirt", "default:bedrock", -90, -80) -replace("default:sand", "default:bedrock", -90, -80) -replace("default:cobble", "default:bedrock", -90, -80) -replace("default:mossycobble", "default:bedrock", -90, -80) -replace("stairs:stair_cobble", "default:bedrock", -90, -80) -replace("default:lava_source", "default:bedrock", -90, -80) -replace("default:lava_flowing", "default:bedrock", -90, -80) -replace("default:water_source", "default:bedrock", -90, -80) -replace("default:water_flowing", "default:bedrock", -90, -80) +replace("air", "mcl_core:bedrock", -90, -80) +replace("air", "mcl_core:lava_source", -80, -70) +replace("mcl_core:stone", "mcl_core:bedrock", -90, -80) +replace("mcl_core:gravel", "mcl_core:bedrock", -90, -80) +replace("mcl_core:dirt", "mcl_core:bedrock", -90, -80) +replace("mcl_core:sand", "mcl_core:bedrock", -90, -80) +replace("mcl_core:cobble", "mcl_core:bedrock", -90, -80) +replace("mcl_core:mossycobble", "mcl_core:bedrock", -90, -80) +replace("stairs:stair_cobble", "mcl_core:bedrock", -90, -80) +replace("mcl_core:lava_source", "mcl_core:bedrock", -90, -80) +replace("mcl_core:lava_flowing", "mcl_core:bedrock", -90, -80) +replace("mcl_core:water_source", "mcl_core:bedrock", -90, -80) +replace("mcl_core:water_flowing", "mcl_core:bedrock", -90, -80) local function bedrock(old) minetest.register_ore({ ore_type = "scatter", - ore = "default:bedrock", + ore = "mcl_core:bedrock", wherein = old, clust_scarcity = 5, clust_num_ores = 3, @@ -544,15 +544,15 @@ local function bedrock(old) }) end bedrock("air") -bedrock("default:stone") -bedrock("default:gravel") -bedrock("default:dirt") -bedrock("default:sand") -bedrock("default:cobble") -bedrock("default:mossycobble") +bedrock("mcl_core:stone") +bedrock("mcl_core:gravel") +bedrock("mcl_core:dirt") +bedrock("mcl_core:sand") +bedrock("mcl_core:cobble") +bedrock("mcl_core:mossycobble") bedrock("stairs:stair_cobble") -bedrock("default:lava_source") -bedrock("default:lava_flowing") -bedrock("default:water_source") -bedrock("default:water_flowing") +bedrock("mcl_core:lava_source") +bedrock("mcl_core:lava_flowing") +bedrock("mcl_core:water_source") +bedrock("mcl_core:water_flowing") diff --git a/mods/mcl_core/mod.conf b/mods/mcl_core/mod.conf new file mode 100644 index 0000000000..575c46655d --- /dev/null +++ b/mods/mcl_core/mod.conf @@ -0,0 +1 @@ +name = mcl_core diff --git a/mods/default/models/character.blend b/mods/mcl_core/models/character.blend similarity index 100% rename from mods/default/models/character.blend rename to mods/mcl_core/models/character.blend diff --git a/mods/default/models/character.png b/mods/mcl_core/models/character.png similarity index 100% rename from mods/default/models/character.png rename to mods/mcl_core/models/character.png diff --git a/mods/default/models/character.x b/mods/mcl_core/models/character.x similarity index 100% rename from mods/default/models/character.x rename to mods/mcl_core/models/character.x diff --git a/mods/default/nodes.lua b/mods/mcl_core/nodes.lua similarity index 73% rename from mods/default/nodes.lua rename to mods/mcl_core/nodes.lua index a6763b8f37..1e0adfd8e1 100644 --- a/mods/default/nodes.lua +++ b/mods/mcl_core/nodes.lua @@ -8,7 +8,7 @@ local LAVA_VISC = 7 -- Node definitions -- -minetest.register_node("default:barrier", { +minetest.register_node("mcl_core:barrier", { description = "Barrier", drawtype = "airlike", paramtype = "light", @@ -21,54 +21,54 @@ minetest.register_node("default:barrier", { on_blast = function() end, }) -minetest.register_node("default:stone", { +minetest.register_node("mcl_core:stone", { description = "Stone", tiles = {"default_stone.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=1, building_block=1, deco_block=1}, - drop = 'default:cobble', - sounds = default.node_sound_stone_defaults(), + drop = 'mcl_core:cobble', + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stone_with_coal", { +minetest.register_node("mcl_core:stone_with_coal", { description = "Coal Ore", tiles = {"default_stone.png^default_mineral_coal.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=3, building_block=1}, - drop = 'default:coal_lump', - sounds = default.node_sound_stone_defaults(), + drop = 'mcl_core:coal_lump', + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stone_with_iron", { +minetest.register_node("mcl_core:stone_with_iron", { description = "Iron Ore", tiles = {"default_stone.png^default_mineral_iron.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=2, building_block=1}, - drop = 'default:stone_with_iron', - sounds = default.node_sound_stone_defaults(), + drop = 'mcl_core:stone_with_iron', + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stone_with_gold", { +minetest.register_node("mcl_core:stone_with_gold", { description = "Gold Ore", tiles = {"default_stone.png^default_mineral_gold.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=2, building_block=1}, - drop = "default:stone_with_gold", - sounds = default.node_sound_stone_defaults(), + drop = "mcl_core:stone_with_gold", + sounds = mcl_core.node_sound_stone_defaults(), }) local redstone_timer = 68.28 local redstone_ore_activate = function(pos) - minetest.swap_node(pos, {name="default:stone_with_redstone_lit"}) + minetest.swap_node(pos, {name="mcl_core:stone_with_redstone_lit"}) local t = minetest.get_node_timer(pos) t:start(redstone_timer) end -minetest.register_node("default:stone_with_redstone", { +minetest.register_node("mcl_core:stone_with_redstone", { description = "Redstone Ore", tiles = {"default_stone.png^default_mineral_redstone.png"}, is_ground_content = true, @@ -86,7 +86,7 @@ minetest.register_node("default:stone_with_redstone", { }, } }, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), on_punch = redstone_ore_activate, on_walk_over = redstone_ore_activate, -- Uses walkover mod }) @@ -96,7 +96,7 @@ local redstone_ore_reactivate = function(pos) t:start(redstone_timer) end -- Light the redstone ore up when it has been touched -minetest.register_node("default:stone_with_redstone_lit", { +minetest.register_node("mcl_core:stone_with_redstone_lit", { description = "Lit Redstone Ore", tiles = {"default_stone.png^default_mineral_redstone.png"}, paramtype = "light", @@ -116,17 +116,17 @@ minetest.register_node("default:stone_with_redstone_lit", { }, } }, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), -- Reset timer after re-punching or stepping on on_punch = redstone_ore_reactivate, on_walk_over = redstone_ore_reactivate, -- Uses walkover mod -- Turn back to normal node after some time has passed on_timer = function(pos, elapsed) - minetest.swap_node(pos, {name="default:stone_with_redstone"}) + minetest.swap_node(pos, {name="mcl_core:stone_with_redstone"}) end, }) -minetest.register_node("default:stone_with_lapis", { +minetest.register_node("mcl_core:stone_with_lapis", { description = "Lapis Lazuli Ore", tiles = {"default_stone.png^default_mineral_lapis.png"}, is_ground_content = true, @@ -142,168 +142,168 @@ minetest.register_node("default:stone_with_lapis", { {items = {'mcl_dye:blue 4'}}, } }, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stone_with_emerald", { +minetest.register_node("mcl_core:stone_with_emerald", { description = "Emerald Ore", tiles = {"default_stone.png^default_mineral_emerald.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=2, building_block=1}, - drop = "default:emerald", - sounds = default.node_sound_stone_defaults(), + drop = "mcl_core:emerald", + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stone_with_diamond", { +minetest.register_node("mcl_core:stone_with_diamond", { description = "Diamond Ore", tiles = {"default_stone.png^default_mineral_diamond.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=1, building_block=1}, - drop = "default:diamond", - sounds = default.node_sound_stone_defaults(), + drop = "mcl_core:diamond", + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stonebrick", { +minetest.register_node("mcl_core:stonebrick", { description = "Stone Bricks", tiles = {"default_stone_brick.png"}, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stonebrickcarved", { +minetest.register_node("mcl_core:stonebrickcarved", { description = "Chiseled Stone Bricks", tiles = {"default_stonebrick_carved.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stonebrickcracked", { +minetest.register_node("mcl_core:stonebrickcracked", { description = "Cracked Stone Bricks", tiles = {"default_stonebrick_cracked.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:stonebrickmossy", { +minetest.register_node("mcl_core:stonebrickmossy", { description = "Mossy Stone Bricks", tiles = {"default_stonebrick_mossy.png"}, stack_max = 64, groups = {cracky=3, stone=1, stonebrick=1, building_block=1, deco_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:granite", { +minetest.register_node("mcl_core:granite", { description = "Granite", tiles = {"default_granite.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:granite_smooth", { +minetest.register_node("mcl_core:granite_smooth", { description = "Polished Granite", tiles = {"default_granite_smooth.png"}, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:andesite", { +minetest.register_node("mcl_core:andesite", { description = "Andesite", tiles = {"default_andesite.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:andesite_smooth", { +minetest.register_node("mcl_core:andesite_smooth", { description = "Polished Andesite", tiles = {"default_andesite_smooth.png"}, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:diorite", { +minetest.register_node("mcl_core:diorite", { description = "Diorite", tiles = {"default_diorite.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:diorite_smooth", { +minetest.register_node("mcl_core:diorite_smooth", { description = "Polished Diorite", tiles = {"default_diorite_smooth.png"}, stack_max = 64, groups = {cracky=3, stone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:dirt_with_grass", { +minetest.register_node("mcl_core:dirt_with_grass", { description = "Grass Block", tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, soil=1, soil_sapling=2, soil_sugarcane=1, cultivatable=2, building_block=1}, - drop = 'default:dirt', - sounds = default.node_sound_dirt_defaults({ + drop = 'mcl_core:dirt', + sounds = mcl_core.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) -- TODO: Add particles -minetest.register_node("default:mycelium", { +minetest.register_node("mcl_core:mycelium", { description = "Mycelium", tiles = {"default_mycelium_top.png", "default_dirt.png", "default_mycelium_side.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, building_block=1}, - drop = 'default:dirt', - sounds = default.node_sound_dirt_defaults({ + drop = 'mcl_core:dirt', + sounds = mcl_core.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), }) -minetest.register_node("default:podzol", { +minetest.register_node("mcl_core:podzol", { description = "Podzol", tiles = {"default_dirt_podzol_top.png", "default_dirt.png", "default_dirt_podzol_side.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, soil=1, soil_sapling=2, soil_sugarcane=1, building_block=1}, - drop = 'default:dirt', - sounds = default.node_sound_dirt_defaults(), + drop = 'mcl_core:dirt', + sounds = mcl_core.node_sound_dirt_defaults(), }) -minetest.register_node("default:dirt", { +minetest.register_node("mcl_core:dirt", { description = "Dirt", tiles = {"default_dirt.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, soil=1, soil_sapling=2, soil_sugarcane=1, cultivatable=2, building_block=1}, - sounds = default.node_sound_dirt_defaults(), + sounds = mcl_core.node_sound_dirt_defaults(), }) -minetest.register_node("default:coarse_dirt", { +minetest.register_node("mcl_core:coarse_dirt", { description = "Coarse Dirt", tiles = {"default_coarse_dirt.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, soil=1, soil_sugarcane=1, cultivatable=1, building_block=1}, - sounds = default.node_sound_dirt_defaults(), + sounds = mcl_core.node_sound_dirt_defaults(), }) -minetest.register_node("default:gravel", { +minetest.register_node("mcl_core:gravel", { description = "Gravel", tiles = {"default_gravel.png"}, is_ground_content = true, @@ -312,115 +312,115 @@ minetest.register_node("default:gravel", { drop = { max_items = 1, items = { - {items = {'default:flint'},rarity = 10}, - {items = {'default:gravel'}} + {items = {'mcl_core:flint'},rarity = 10}, + {items = {'mcl_core:gravel'}} } }, - sounds = default.node_sound_dirt_defaults({ + sounds = mcl_core.node_sound_dirt_defaults({ footstep = {name="default_gravel_footstep", gain=0.45}, }), }) -- sandstone -- -minetest.register_node("default:sand", { +minetest.register_node("mcl_core:sand", { description = "Sand", tiles = {"default_sand.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, falling_node=1, sand=1, soil_sugarcane=1, building_block=1}, - sounds = default.node_sound_sand_defaults(), + sounds = mcl_core.node_sound_sand_defaults(), }) -minetest.register_node("default:sandstone", { +minetest.register_node("mcl_core:sandstone", { description = "Sandstone", tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_normal.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,sandstone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:sandstonesmooth", { +minetest.register_node("mcl_core:sandstonesmooth", { description = "Smooth Sandstone", tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_smooth.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,sandstone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:sandstonecarved", { +minetest.register_node("mcl_core:sandstonecarved", { description = "Chiseled Sandstone", tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_carved.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,sandstone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -- red sandstone -- -minetest.register_node("default:redsand", { +minetest.register_node("mcl_core:redsand", { description = "Red Sand", tiles = {"default_red_sand.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, falling_node=1, sand=1, soil_sugarcane=1, building_block=1}, - sounds = default.node_sound_sand_defaults(), + sounds = mcl_core.node_sound_sand_defaults(), }) -minetest.register_node("default:redsandstone", { +minetest.register_node("mcl_core:redsandstone", { description = "Red Sandstone", tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,redsandstone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:redsandstonesmooth", { +minetest.register_node("mcl_core:redsandstonesmooth", { description = "Smooth Red Sandstone", tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_smooth.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,redsandstone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:redsandstonecarved", { +minetest.register_node("mcl_core:redsandstonecarved", { description = "Chiseled Red Sandstone", tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_carved.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=2,cracky=2,redsandstone=1, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) --- -minetest.register_node("default:clay", { +minetest.register_node("mcl_core:clay", { -- Original name: Clay description = "Block of Clay", tiles = {"default_clay.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3, building_block=1}, - drop = 'default:clay_lump 4', - sounds = default.node_sound_dirt_defaults({ + drop = 'mcl_core:clay_lump 4', + sounds = mcl_core.node_sound_dirt_defaults({ footstep = "", }), }) -minetest.register_node("default:brick", { +minetest.register_node("mcl_core:brick", { description = "Bricks", tiles = {"default_brick.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=3, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:haybale", { +minetest.register_node("mcl_core:haybale", { description = "Hay Bale", tiles = {"default_hayblock_top.png", "default_hayblock_top.png", "default_hayblock_side.png"}, is_ground_content = false, @@ -429,11 +429,11 @@ minetest.register_node("default:haybale", { is_ground_content = false, on_place = minetest.rotate_node, groups = {oddly_breakable_by_hand=3,flammable=2, building_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) --[[ -minetest.register_node("default:bone_block", { +minetest.register_node("mcl_core:bone_block", { description = "Bone Block", -- FIXME: Missing texutres tiles = {"default_bone_block_top.png", "default_bone_block_top.png", "default_bone_block_side.png"}, @@ -441,11 +441,11 @@ minetest.register_node("default:bone_block", { paramtype2 = "facedir", on_place = minetest.rotate_node, groups = {cracky=3, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) ]] -minetest.register_node("default:sea_lantern", { +minetest.register_node("mcl_core:sea_lantern", { description = "Sea Lantern", paramtype2 = "facedir", is_ground_content = false, @@ -454,57 +454,57 @@ minetest.register_node("default:sea_lantern", { drop = { max_items = 1, items = { - { items = {'default:prismarine_cry 3'}, rarity = 2 }, - { items = {'default:prismarine_cry 2'}} + { items = {'mcl_core:prismarine_cry 3'}, rarity = 2 }, + { items = {'mcl_core:prismarine_cry 2'}} } }, tiles = {"default_sea_lantern.png"}, groups = {oddly_breakable_by_hand=3, building_block=1}, - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), }) -minetest.register_node("default:prismarine", { +minetest.register_node("mcl_core:prismarine", { description = "Prismarine", stack_max = 64, is_ground_content = false, tiles = {{name="default_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}}, groups = {cracky=3, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:prismarine_brick", { +minetest.register_node("mcl_core:prismarine_brick", { description = "Prismarine Bricks", stack_max = 64, is_ground_content = false, tiles = {"default_prismarine_bricks.png"}, groups = {cracky=2, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:prismarine_dark", { +minetest.register_node("mcl_core:prismarine_dark", { description = "Dark Prismarine", stack_max = 64, is_ground_content = false, tiles = {"default_prismarine_dark.png"}, groups = {cracky=2, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -- Oak tree -- -minetest.register_node("default:tree", { +minetest.register_node("mcl_core:tree", { description = "Oak Wood", tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"}, paramtype2 = "facedir", on_place = minetest.rotate_node, stack_max = 64, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2, building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:sapling", { +minetest.register_node("mcl_core:sapling", { description = "Oak Sapling", drawtype = "plantlike", visual_scale = 1.0, @@ -519,10 +519,10 @@ minetest.register_node("default:sapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) -minetest.register_node("default:leaves", { +minetest.register_node("mcl_core:leaves", { description = "Oak Leaves", drawtype = "allfaces_optional", visual_scale = 1.3, @@ -535,31 +535,31 @@ minetest.register_node("default:leaves", { items = { { -- player will get sapling with 1/20 chance - items = {'default:sapling'}, + items = {'mcl_core:sapling'}, rarity = 20, }, { -- player will get apple with 1/200 chance - items = {'default:apple'}, + items = {'mcl_core:apple'}, rarity = 200, }, } }, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) -- Dark oak tree -- -minetest.register_node("default:darktree", { +minetest.register_node("mcl_core:darktree", { description = "Dark Oak Wood", tiles = {"default_log_big_oak_top.png", "default_log_big_oak_top.png", "default_log_big_oak.png"}, paramtype2 = "facedir", on_place = minetest.rotate_node, stack_max = 64, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:darksapling", { +minetest.register_node("mcl_core:darksapling", { description = "Dark Oak Sapling", drawtype = "plantlike", visual_scale = 1.0, @@ -574,10 +574,10 @@ minetest.register_node("default:darksapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) -minetest.register_node("default:darkleaves", { +minetest.register_node("mcl_core:darkleaves", { description = "Dark Oak Leaves", drawtype = "allfaces_optional", visual_scale = 1.3, @@ -590,41 +590,41 @@ minetest.register_node("default:darkleaves", { items = { { -- player will get sapling with 1/20 chance - items = {'default:darksapling'}, + items = {'mcl_core:darksapling'}, rarity = 20, }, { -- player will get apple with 1/200 chance - items = {'default:apple'}, + items = {'mcl_core:apple'}, rarity = 200, }, } }, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) -- Jungle Tree -- -minetest.register_node("default:jungletree", { +minetest.register_node("mcl_core:jungletree", { description = "Jungle Wood", tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"}, stack_max = 64, paramtype2 = "facedir", on_place = minetest.rotate_node, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:junglewood", { +minetest.register_node("mcl_core:junglewood", { description = "Jungle Wood Planks", tiles = {"default_junglewood.png"}, stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:jungleleaves", { +minetest.register_node("mcl_core:jungleleaves", { description = "Jungle Leaves", drawtype = "allfaces_optional", visual_scale = 1.3, @@ -636,15 +636,15 @@ minetest.register_node("default:jungleleaves", { max_items = 1, items = { { - items = {'default:junglesapling'}, + items = {'mcl_core:junglesapling'}, rarity = 40, }, } }, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) -minetest.register_node("default:junglesapling", { +minetest.register_node("mcl_core:junglesapling", { description = "Jungle Sapling", drawtype = "plantlike", visual_scale = 1.0, @@ -659,32 +659,32 @@ minetest.register_node("default:junglesapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) -- Accacia Tree -- -minetest.register_node("default:acaciatree", { +minetest.register_node("mcl_core:acaciatree", { description = "Acacia Wood", tiles = {"default_acaciatree_top.png", "default_acaciatree_top.png", "default_acaciatree.png"}, stack_max = 64, paramtype2 = "facedir", on_place = minetest.rotate_node, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:acaciawood", { +minetest.register_node("mcl_core:acaciawood", { description = "Acacia Wood Planks", tiles = {"default_acaciawood.png"}, stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:acacialeaves", { +minetest.register_node("mcl_core:acacialeaves", { description = "Acacia Leaves", drawtype = "allfaces_optional", visual_scale = 1.3, @@ -696,15 +696,15 @@ minetest.register_node("default:acacialeaves", { max_items = 1, items = { { - items = {'default:acaciasapling'}, + items = {'mcl_core:acaciasapling'}, rarity = 20, }, } }, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) -minetest.register_node("default:acaciasapling", { +minetest.register_node("mcl_core:acaciasapling", { description = "Acacia Sapling", drawtype = "plantlike", visual_scale = 1.0, @@ -719,31 +719,31 @@ minetest.register_node("default:acaciasapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) -- Spruce Tree -- -minetest.register_node("default:sprucetree", { +minetest.register_node("mcl_core:sprucetree", { description = "Spruce Wood", tiles = {"default_sprucetree_top.png", "default_sprucetree_top.png", "default_sprucetree.png"}, stack_max = 64, paramtype2 = "facedir", on_place = minetest.rotate_node, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:sprucewood", { +minetest.register_node("mcl_core:sprucewood", { description = "Spruce Wood Planks", tiles = {"default_sprucewood.png"}, stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:spruceleaves", { +minetest.register_node("mcl_core:spruceleaves", { description = "Spruce Leaves", drawtype = "allfaces_optional", visual_scale = 1.3, @@ -756,7 +756,7 @@ minetest.register_node("default:spruceleaves", { items = { { -- player will get sapling with 1/20 chance - items = {'default:sprucesapling'}, + items = {'mcl_core:sprucesapling'}, rarity = 20, }, { @@ -766,10 +766,10 @@ minetest.register_node("default:spruceleaves", { } } }, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) -minetest.register_node("default:sprucesapling", { +minetest.register_node("mcl_core:sprucesapling", { description = "Spruce Sapling", drawtype = "plantlike", visual_scale = 1.0, @@ -784,29 +784,29 @@ minetest.register_node("default:sprucesapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) -minetest.register_node("default:birchtree", { +minetest.register_node("mcl_core:birchtree", { description = "Birch Wood", tiles = {"default_log_birch_top.png", "default_log_birch_top.png", "default_log_birch.png"}, stack_max = 64, paramtype2 = "facedir", on_place = minetest.rotate_node, groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:birchwood", { +minetest.register_node("mcl_core:birchwood", { description = "Birch Wood Planks", tiles = {"default_planks_birch.png"}, stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:birchleaves", { +minetest.register_node("mcl_core:birchleaves", { description = "Birch Leaves", drawtype = "allfaces_optional", visual_scale = 1.3, @@ -819,15 +819,15 @@ minetest.register_node("default:birchleaves", { items = { { -- player will get sapling with 1/20 chance - items = {'default:birchsapling'}, + items = {'mcl_core:birchsapling'}, rarity = 20, }, } }, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) -minetest.register_node("default:birchsapling", { +minetest.register_node("mcl_core:birchsapling", { description = "Birch Sapling", drawtype = "plantlike", visual_scale = 1.0, @@ -842,10 +842,10 @@ minetest.register_node("default:birchsapling", { }, stack_max = 64, groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) -minetest.register_node("default:junglegrass", { +minetest.register_node("mcl_core:junglegrass", { description = "Double Tallgrass", drawtype = "plantlike", visual_scale = 1.3, @@ -858,7 +858,7 @@ minetest.register_node("default:junglegrass", { is_ground_content = true, stack_max = 64, groups = {dig_immediate=3,flammable=2,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}, @@ -874,14 +874,14 @@ minetest.register_node("default:junglegrass", { }, }) -minetest.register_node("default:cactus", { +minetest.register_node("mcl_core:cactus", { description = "Cactus", drawtype = "nodebox", tiles = {"default_cactus_top.png", "default_cactus_bottom.png", "default_cactus_side.png","default_cactus_side.png","default_cactus_side.png","default_cactus_side.png"}, is_ground_content = true, stack_max = 64, groups = {oddly_breakable_by_hand=2,deco_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), paramtype = "light", node_box = { type = "fixed", @@ -903,7 +903,7 @@ minetest.register_node("default:cactus", { }) -minetest.register_node("default:reeds", { +minetest.register_node("mcl_core:reeds", { description = "Sugar Canes", drawtype = "plantlike", tiles = {"default_papyrus.png"}, @@ -930,38 +930,38 @@ minetest.register_node("default:reeds", { }, stack_max = 64, groups = {dig_immediate=3,flammable=2,craftitem=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) -minetest.register_node("default:quartz_ore", { +minetest.register_node("mcl_core:quartz_ore", { description = "Nether Quartz Ore", stack_max = 64, tiles = {"default_quartz_ore.png"}, is_ground_content = false, groups = {cracky=3,building_block=1}, - drop = 'default:quartz_crystal', - sounds = default.node_sound_stone_defaults(), + drop = 'mcl_core:quartz_crystal', + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:quartz_block", { +minetest.register_node("mcl_core:quartz_block", { description = "Block of Quartz", stack_max = 64, tiles = {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"}, groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:quartz_chiseled", { +minetest.register_node("mcl_core:quartz_chiseled", { description = "Chiseled Quartz Block", stack_max = 64, is_ground_content = false, tiles = {"default_quartz_chiseled_top.png", "default_quartz_chiseled_top.png", "default_quartz_chiseled_side.png"}, groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:quartz_pillar", { +minetest.register_node("mcl_core:quartz_pillar", { description = "Pillar Quartz Block", stack_max = 64, paramtype2 = "facedir", @@ -969,31 +969,31 @@ minetest.register_node("default:quartz_pillar", { on_place = minetest.rotate_node, tiles = {"default_quartz_pillar_top.png", "default_quartz_pillar_top.png", "default_quartz_pillar_side.png"}, groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:bedrock", { +minetest.register_node("mcl_core:bedrock", { description = "Bedrock", tiles = {"default_bedrock.png"}, stack_max = 64, groups = {oddly_breakable_by_hand=5,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), is_ground_content = false, on_blast = function() end, drop = '', }) -minetest.register_node("default:bookshelf", { +minetest.register_node("mcl_core:bookshelf", { description = "Bookshelf", tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"}, stack_max = 64, is_ground_content = false, groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3,building_block=1}, - drop = "default:book 3", - sounds = default.node_sound_wood_defaults(), + drop = "mcl_core:book 3", + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:slimeblock", { +minetest.register_node("mcl_core:slimeblock", { description = "Slime Block", drawtype = "nodebox", paramtype = "light", @@ -1015,7 +1015,7 @@ minetest.register_node("default:slimeblock", { groups = {oddly_breakable_by_hand=3,dig_immediate=2,bouncy=44,fall_damage_add_percent=-100,deco_block=1}, }) -minetest.register_node("default:glass", { +minetest.register_node("mcl_core:glass", { description = "Glass", drawtype = "glasslike", is_ground_content = false, @@ -1024,29 +1024,29 @@ minetest.register_node("default:glass", { sunlight_propagates = true, stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=3,building_block=1}, - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), drop = "", }) ---- colored glass -default.add_glass( "Red Stained Glass", "basecolor_red", "red") -default.add_glass( "Green Stained Glass", "unicolor_dark_green", "green") -default.add_glass( "Blue Stained Glass", "basecolor_blue", "blue") -default.add_glass( "Light Blue Stained Glass", "unicolor_light_blue", "light_blue") -default.add_glass( "Black Stained Glass", "basecolor_black", "black") -default.add_glass( "White Stained Glass", "basecolor_white", "white") -default.add_glass( "Yellow Stained Glass", "basecolor_yellow", "yellow") -default.add_glass( "Brown Stained Glass", "unicolor_dark_orange", "brown") -default.add_glass( "Orange Stained Glass", "excolor_orange", "orange") -default.add_glass( "Pink Stained Glass", "unicolor_light_red", "pink") -default.add_glass( "Gray Stained Glass", "unicolor_darkgrey", "gray") -default.add_glass( "Lime Stained Glass", "basecolor_green", "lime") -default.add_glass( "Light Gray Stained Glass", "basecolor_grey", "silver") -default.add_glass( "Magenta Stained Glass", "basecolor_magenta", "magenta") -default.add_glass( "Purple Stained Glass", "excolor_violet", "purple") -default.add_glass( "Cyan Stained Glass", "basecolor_cyan", "cyan") +mcl_core.add_glass( "Red Stained Glass", "basecolor_red", "red") +mcl_core.add_glass( "Green Stained Glass", "unicolor_dark_green", "green") +mcl_core.add_glass( "Blue Stained Glass", "basecolor_blue", "blue") +mcl_core.add_glass( "Light Blue Stained Glass", "unicolor_light_blue", "light_blue") +mcl_core.add_glass( "Black Stained Glass", "basecolor_black", "black") +mcl_core.add_glass( "White Stained Glass", "basecolor_white", "white") +mcl_core.add_glass( "Yellow Stained Glass", "basecolor_yellow", "yellow") +mcl_core.add_glass( "Brown Stained Glass", "unicolor_dark_orange", "brown") +mcl_core.add_glass( "Orange Stained Glass", "excolor_orange", "orange") +mcl_core.add_glass( "Pink Stained Glass", "unicolor_light_red", "pink") +mcl_core.add_glass( "Gray Stained Glass", "unicolor_darkgrey", "gray") +mcl_core.add_glass( "Lime Stained Glass", "basecolor_green", "lime") +mcl_core.add_glass( "Light Gray Stained Glass", "basecolor_grey", "silver") +mcl_core.add_glass( "Magenta Stained Glass", "basecolor_magenta", "magenta") +mcl_core.add_glass( "Purple Stained Glass", "excolor_violet", "purple") +mcl_core.add_glass( "Cyan Stained Glass", "basecolor_cyan", "cyan") -minetest.register_node("default:rail", { +minetest.register_node("mcl_core:rail", { description = "Rail", drawtype = "raillike", tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"}, @@ -1064,7 +1064,7 @@ minetest.register_node("default:rail", { groups = {dig_immediate=2,attached_node=1,rail=1,connect_to_raillike=1,dig_by_water=1,transport=1}, }) -minetest.register_node("default:ladder", { +minetest.register_node("mcl_core:ladder", { description = "Ladder", drawtype = "signlike", is_ground_content = false, @@ -1083,11 +1083,11 @@ minetest.register_node("default:ladder", { }, stack_max = 64, groups = {choppy=2,oddly_breakable_by_hand=3,flammable=2,deco_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:vine", { +minetest.register_node("mcl_core:vine", { description = "Vines", drawtype = "signlike", tiles = {"default_vine.png"}, @@ -1102,11 +1102,11 @@ minetest.register_node("default:vine", { }, stack_max = 64, groups = {choppy=2,oddly_breakable_by_hand=3,flammable=2,deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), drop = "", after_dig_node = function(pos, oldnode, oldmetadata, user) local item = user:get_wielded_item() - if item:get_name() == "default:shears" then + if item:get_name() == "mcl_core:shears" then user:get_inventory():add_item("main", ItemStack(oldnode.name)) end local next_find = true @@ -1114,7 +1114,7 @@ minetest.register_node("default:vine", { while next_find == true do local pos2 = {x=pos.x, y=pos.y-ptr, z=pos.z} local node = minetest.get_node(pos2) - if node.name == "default:vine" and check_attached_node(pos2, node) == false then + if node.name == "mcl_core:vine" and check_attached_node(pos2, node) == false then drop_attached_node(pos2) core.check_for_falling(pos2) ptr = ptr + 1 @@ -1127,25 +1127,25 @@ minetest.register_node("default:vine", { -minetest.register_node("default:wood", { +minetest.register_node("mcl_core:wood", { description = "Oak Wood Planks", tiles = {"default_wood.png"}, stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:darkwood", { +minetest.register_node("mcl_core:darkwood", { description = "Dark Oak Wood Planks", tiles = {"default_planks_big_oak.png"}, stack_max = 64, is_ground_content = false, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) -minetest.register_node("default:water_flowing", { +minetest.register_node("mcl_core:water_flowing", { description = "Flowing Water", inventory_image = minetest.inventorycube("default_water.png"), drawtype = "flowingliquid", @@ -1172,16 +1172,16 @@ minetest.register_node("default:water_flowing", { drop = "", drowning = 4, liquidtype = "flowing", - liquid_alternative_flowing = "default:water_flowing", - liquid_alternative_source = "default:water_source", + liquid_alternative_flowing = "mcl_core:water_flowing", + liquid_alternative_source = "mcl_core:water_source", liquid_viscosity = WATER_VISC, liquid_range = 7, - freezemelt = "default:snow", + freezemelt = "mcl_core:snow", post_effect_color = {a=64, r=100, g=100, b=200}, groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1, freezes=1, melt_around=1}, }) -minetest.register_node("default:water_source", { +minetest.register_node("mcl_core:water_source", { description = "Still Water", inventory_image = minetest.inventorycube("default_water.png"), drawtype = "liquid", @@ -1205,17 +1205,17 @@ minetest.register_node("default:water_source", { drop = "", drowning = 4, liquidtype = "source", - liquid_alternative_flowing = "default:water_flowing", - liquid_alternative_source = "default:water_source", + liquid_alternative_flowing = "mcl_core:water_flowing", + liquid_alternative_source = "mcl_core:water_source", liquid_viscosity = WATER_VISC, liquid_range = 7, - freezemelt = "default:ice", + freezemelt = "mcl_core:ice", post_effect_color = {a=64, r=100, g=100, b=200}, stack_max = 64, groups = {water=3, liquid=3, puts_out_fire=1, freezes=1, not_in_creative_inventory=1}, }) -minetest.register_node("default:lava_flowing", { +minetest.register_node("mcl_core:lava_flowing", { description = "Flowing Lava", inventory_image = minetest.inventorycube("default_lava.png"), drawtype = "flowingliquid", @@ -1245,8 +1245,8 @@ minetest.register_node("default:lava_flowing", { translates to 4 drowning damage ]] drowning = 4, liquidtype = "flowing", - liquid_alternative_flowing = "default:lava_flowing", - liquid_alternative_source = "default:lava_source", + liquid_alternative_flowing = "mcl_core:lava_flowing", + liquid_alternative_source = "mcl_core:lava_source", liquid_viscosity = LAVA_VISC, liquid_renewable = false, liquid_range = 4, @@ -1255,7 +1255,7 @@ minetest.register_node("default:lava_flowing", { groups = {lava=3, liquid=2, igniter=3, not_in_creative_inventory=1}, }) -minetest.register_node("default:lava_source", { +minetest.register_node("mcl_core:lava_source", { description = "Still Lava", inventory_image = minetest.inventorycube("default_lava.png"), drawtype = "liquid", @@ -1279,8 +1279,8 @@ minetest.register_node("default:lava_source", { drop = "", drowning = 4, liquidtype = "source", - liquid_alternative_flowing = "default:lava_flowing", - liquid_alternative_source = "default:lava_source", + liquid_alternative_flowing = "mcl_core:lava_flowing", + liquid_alternative_source = "mcl_core:lava_source", liquid_viscosity = LAVA_VISC, liquid_renewable = false, liquid_range = 4, @@ -1290,88 +1290,88 @@ minetest.register_node("default:lava_source", { groups = {lava=3, liquid=2, igniter=3, not_in_creative_inventory=1}, }) -minetest.register_node("default:cobble", { +minetest.register_node("mcl_core:cobble", { description = "Cobblestone", tiles = {"default_cobble.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=3, stone=2, building_block=1, deco_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:mossycobble", { +minetest.register_node("mcl_core:mossycobble", { description = "Moss Stone", tiles = {"default_mossycobble.png"}, is_ground_content = true, stack_max = 64, groups = {cracky=3, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:coalblock", { +minetest.register_node("mcl_core:coalblock", { description = "Block of Coal", tiles = {"default_coal_block.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=2, building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:steelblock", { +minetest.register_node("mcl_core:steelblock", { description = "Block of Iron", tiles = {"default_steel_block.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=1,level=2,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:goldblock", { +minetest.register_node("mcl_core:goldblock", { description = "Block of Gold", tiles = {"default_gold_block.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=1,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:diamondblock", { +minetest.register_node("mcl_core:diamondblock", { description = "Block of Diamond", tiles = {"default_diamond_block.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=1,level=3,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:lapisblock", { +minetest.register_node("mcl_core:lapisblock", { description = "Lapis Lazul Block", tiles = {"default_lapis_block.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=1,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:emeraldblock", { +minetest.register_node("mcl_core:emeraldblock", { description = "Block of Emerald", tiles = {"default_emerald_block.png"}, is_ground_content = false, stack_max = 64, groups = {cracky=1,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:obsidian", { +minetest.register_node("mcl_core:obsidian", { description = "Obsidian", tiles = {"default_obsidian.png"}, is_ground_content = true, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), stack_max = 64, groups = {cracky=4,level=2,oddly_breakable_by_hand=4,building_block=1}, }) -minetest.register_node("default:dry_shrub", { +minetest.register_node("mcl_core:dry_shrub", { description = "Dead Bush", drawtype = "plantlike", visual_scale = 1.0, @@ -1386,23 +1386,23 @@ minetest.register_node("default:dry_shrub", { max_items = 1, items = { { - items = {"default:stick 2"}, + items = {"mcl_core:stick 2"}, rarity = 2, }, { - items = {"default:stick 1"}, + items = {"mcl_core:stick 1"}, rarity = 2, }, } }, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = {-1/3, -1/2, -1/3, 1/3, 1/6, 1/3}, }, }) -minetest.register_node("default:grass", { +minetest.register_node("mcl_core:grass", { description = "Tall Grass", drawtype = "plantlike", tiles = {"default_tallgrass.png"}, @@ -1422,16 +1422,16 @@ minetest.register_node("default:grass", { buildable_to = true, is_ground_content = true, groups = {snappy=3,flammable=3,attached_node=1,dig_immediate=3,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), after_dig_node = function(pos, oldnode, oldmetadata, user) local item = user:get_wielded_item() - if item:get_name() == "default:shears" then + if item:get_name() == "mcl_core:shears" then user:get_inventory():add_item("main", ItemStack(oldnode.name)) end end }) -minetest.register_node("default:glowstone", { +minetest.register_node("mcl_core:glowstone", { description = "Glowstone", tiles = {"default_glowstone.png"}, is_ground_content = true, @@ -1440,16 +1440,16 @@ minetest.register_node("default:glowstone", { drop = { max_items = 1, items = { - {items = {'default:glowdust 4'},rarity = 3}, - {items = {'default:glowdust 3'},rarity = 3}, - {items = {'default:glowdust 2'}}, + {items = {'mcl_core:glowdust 4'},rarity = 3}, + {items = {'mcl_core:glowdust 3'},rarity = 3}, + {items = {'mcl_core:glowdust 2'}}, } }, light_source = 12, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -minetest.register_node("default:sponge", { +minetest.register_node("mcl_core:sponge", { description = "Sponge", drawtype = "normal", is_ground_content = false, @@ -1460,7 +1460,7 @@ minetest.register_node("default:sponge", { diggable = true, buildable_to = false, stack_max = 64, - sounds = default.node_sound_dirt_defaults(), + sounds = mcl_core.node_sound_dirt_defaults(), groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,building_block=1}, on_place = function(itemstack, placer, pointed_thing) local pn = placer:get_player_name() @@ -1482,7 +1482,7 @@ minetest.register_node("default:sponge", { local p = {x=pos.x+i, y=pos.y, z=pos.z} local n = minetest.get_node(p) -- On verifie si il y a de l'eau - if (n.name=="default:water_flowing") or (n.name == "default:water_source") then + if (n.name=="mcl_core:water_flowing") or (n.name == "mcl_core:water_source") then on_water = true end end @@ -1490,7 +1490,7 @@ minetest.register_node("default:sponge", { local p = {x=pos.x, y=pos.y+i, z=pos.z} local n = minetest.get_node(p) -- On verifie si il y a de l'eau - if (n.name=="default:water_flowing") or (n.name == "default:water_source") then + if (n.name=="mcl_core:water_flowing") or (n.name == "mcl_core:water_source") then on_water = true end end @@ -1498,7 +1498,7 @@ minetest.register_node("default:sponge", { local p = {x=pos.x, y=pos.y, z=pos.z+i} local n = minetest.get_node(p) -- On verifie si il y a de l'eau - if (n.name=="default:water_flowing") or (n.name == "default:water_source") then + if (n.name=="mcl_core:water_flowing") or (n.name == "mcl_core:water_source") then on_water = true end end @@ -1510,7 +1510,7 @@ minetest.register_node("default:sponge", { p = {x=pos.x+i, y=pos.y+j, z=pos.z+k} n = minetest.get_node(p) -- On Supprime l'eau - if (n.name=="default:water_flowing") or (n.name == "default:water_source")then + if (n.name=="mcl_core:water_flowing") or (n.name == "mcl_core:water_source")then minetest.add_node(p, {name="air"}) change = true end @@ -1521,16 +1521,16 @@ minetest.register_node("default:sponge", { p = {x=pos.x, y=pos.y, z=pos.z} n = minetest.get_node(p) if change == true then - minetest.add_node(pointed_thing.above, {name = "default:sponge_wet"}) + minetest.add_node(pointed_thing.above, {name = "mcl_core:sponge_wet"}) else - minetest.add_node(pointed_thing.above, {name = "default:sponge"}) + minetest.add_node(pointed_thing.above, {name = "mcl_core:sponge"}) end return itemstack end }) -minetest.register_node("default:sponge_wet", { +minetest.register_node("mcl_core:sponge_wet", { description = "Wet Sponge", drawtype = "normal", is_ground_content = false, @@ -1541,12 +1541,12 @@ minetest.register_node("default:sponge_wet", { diggable = true, buildable_to = false, stack_max = 64, - sounds = default.node_sound_dirt_defaults(), + sounds = mcl_core.node_sound_dirt_defaults(), groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,building_block=1}, }) -minetest.register_node("default:ice", { +minetest.register_node("mcl_core:ice", { description = "Ice", drawtype = "glasslike", tiles = {"default_ice.png"}, @@ -1556,10 +1556,10 @@ minetest.register_node("default:ice", { stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=2,building_block=1}, drop = "", - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), }) -minetest.register_node("default:packed_ice", { +minetest.register_node("mcl_core:packed_ice", { description = "Packed Ice", drawtype = "glasslike", tiles = {"default_ice_packed.png"}, @@ -1569,7 +1569,7 @@ minetest.register_node("default:packed_ice", { stack_max = 64, groups = {cracky=3,oddly_breakable_by_hand=2,building_block=1}, drop = "", - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), }) -- Frosted Ice (4 nodes) @@ -1582,9 +1582,9 @@ for i=0,3 do if age == nil then return end local nextnode if age < 3 then - nextnode = "default:frosted_ice_"..(age+1) + nextnode = "mcl_core:frosted_ice_"..(age+1) else - nextnode = "default:water_source" + nextnode = "mcl_core:water_source" end minetest.swap_node(pos, { name = nextnode }) -- Spread aging to neighbor blocks, but not recursively @@ -1594,7 +1594,7 @@ for i=0,3 do end end end - minetest.register_node("default:frosted_ice_"..i, { + minetest.register_node("mcl_core:frosted_ice_"..i, { description = "Frosted Ice", drawtype = "glasslike", tiles = {"default_frosted_ice_"..i..".png"}, @@ -1604,7 +1604,7 @@ for i=0,3 do stack_max = 64, groups = {cracky=2, frosted_ice=1, not_in_creative_inventory=1}, drop = "", - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), on_construct = function(pos) local timer = minetest.get_node_timer(pos) timer:start(1.5) @@ -1625,7 +1625,7 @@ for i=0,3 do }) end -minetest.register_node("default:snow", { +minetest.register_node("mcl_core:snow", { description = "Top Snow", tiles = {"default_snow.png"}, is_ground_content = true, @@ -1640,25 +1640,25 @@ minetest.register_node("default:snow", { }, }, groups = {crumbly=3,falling_node=1,deco_block=1}, - sounds = default.node_sound_dirt_defaults({ + sounds = mcl_core.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), drop = "mcl_throwing:snowball 2", }) -minetest.register_node("default:snowblock", { +minetest.register_node("mcl_core:snowblock", { description = "Snow", tiles = {"default_snow.png"}, is_ground_content = true, stack_max = 64, groups = {crumbly=3,building_block=1}, - sounds = default.node_sound_dirt_defaults({ + sounds = mcl_core.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, }), drop = "mcl_throwing:snowball 4", }) -minetest.register_node("default:cobweb", { +minetest.register_node("mcl_core:cobweb", { description = "Cobweb", drawtype = "plantlike", paramtype2 = "degrotate", @@ -1670,12 +1670,12 @@ minetest.register_node("default:cobweb", { sunlight_propagates = true, liquid_viscosity = 14, liquidtype = "source", - liquid_alternative_flowing = "default:cobweb", - liquid_alternative_source = "default:cobweb", + liquid_alternative_flowing = "mcl_core:cobweb", + liquid_alternative_source = "mcl_core:cobweb", liquid_renewable = false, liquid_range = 0, walkable = false, groups = {snappy=1,liquid=3,flammable=2,deco_block=1}, - drop = "default:string", + drop = "mcl_core:string", }) diff --git a/mods/default/player.lua b/mods/mcl_core/player.lua similarity index 83% rename from mods/default/player.lua rename to mods/mcl_core/player.lua index d0e895c2ed..7d069ebe4c 100644 --- a/mods/default/player.lua +++ b/mods/mcl_core/player.lua @@ -6,29 +6,29 @@ API --- -default.player_register_model(name, def) +mcl_core.player_register_model(name, def) ^ Register a new model to be used by players. ^ is the model filename such as "character.x", "foo.b3d", etc. ^ See Model Definition below for format of . -default.registered_player_models[name] +mcl_core.registered_player_models[name] ^ See Model Definition below for format. -default.player_set_model(player, model_name) +mcl_core.player_set_model(player, model_name) ^ is a PlayerRef. ^ is a model registered with player_register_model. -default.player_set_animation(player, anim_name [, speed]) +mcl_core.player_set_animation(player, anim_name [, speed]) ^ is a PlayerRef. ^ is the name of the animation. ^ is in frames per second. If nil, default from the model is used -default.player_set_textures(player, textures) +mcl_core.player_set_textures(player, textures) ^ is a PlayerRef. ^ is an array of textures ^ If is nil, the default textures from the model def are used -default.player_get_animation(player) +mcl_core.player_get_animation(player) ^ is a PlayerRef. ^ Returns a table containing fields "model", "textures" and "animation". ^ Any of the fields of the returned table may be nil. @@ -54,17 +54,17 @@ model_def = { -- Note: This is currently broken due to a bug in Irrlicht, leave at 0 local animation_blend = 0 -default.registered_player_models = { } +mcl_core.registered_player_models = { } -- Local for speed. -local models = default.registered_player_models +local models = mcl_core.registered_player_models -function default.player_register_model(name, def) +function mcl_core.player_register_model(name, def) models[name] = def end -- Default player appearance -default.player_register_model("character.x", { +mcl_core.player_register_model("character.x", { animation_speed = 30, textures = {"character.png", }, animations = { @@ -84,9 +84,9 @@ local player_model = {} local player_textures = {} local player_anim = {} local player_sneak = {} -default.player_attached = {} +mcl_core.player_attached = {} -function default.player_get_animation(player) +function mcl_core.player_get_animation(player) local name = player:get_player_name() return { model = player_model[name], @@ -96,7 +96,7 @@ function default.player_get_animation(player) end -- Called when a player's appearance needs to be updated -function default.player_set_model(player, model_name) +function mcl_core.player_set_model(player, model_name) local name = player:get_player_name() local model = models[model_name] if model then @@ -109,7 +109,7 @@ function default.player_set_model(player, model_name) visual = "mesh", visual_size = model.visual_size or {x=1, y=1}, }) - default.player_set_animation(player, "stand") + mcl_core.player_set_animation(player, "stand") else player:set_properties({ textures = { "player.png", "player_back.png", }, @@ -119,13 +119,13 @@ function default.player_set_model(player, model_name) player_model[name] = model_name end -function default.player_set_textures(player, textures) +function mcl_core.player_set_textures(player, textures) local name = player:get_player_name() player_textures[name] = textures player:set_properties({textures = textures,}) end -function default.player_set_animation(player, anim_name, speed) +function mcl_core.player_set_animation(player, anim_name, speed) local name = player:get_player_name() if player_anim[name] == anim_name then return @@ -141,8 +141,8 @@ end -- Update appearance when the player joins minetest.register_on_joinplayer(function(player) - default.player_attached[player:get_player_name()] = false - default.player_set_model(player, "character.x") + mcl_core.player_attached[player:get_player_name()] = false + mcl_core.player_set_model(player, "character.x") -- Minecraft has no sneak glitch -- sneak is also disabled because it is buggy in Minetest (can be used to negate fall damage) player:set_physics_override({sneak_glitch=false}) @@ -159,7 +159,7 @@ minetest.register_on_leaveplayer(function(player) end) -- Localize for better performance. -local player_set_animation = default.player_set_animation +local player_set_animation = mcl_core.player_set_animation -- Check each player and apply animations minetest.register_globalstep(function(dtime) @@ -167,7 +167,7 @@ minetest.register_globalstep(function(dtime) local name = player:get_player_name() local model_name = player_model[name] local model = model_name and models[model_name] - if model and not default.player_attached[name] then + if model and not mcl_core.player_attached[name] then local controls = player:get_player_control() local walking = false local animation_speed_mod = model.animation_speed or 30 diff --git a/mods/default/sounds/default_break_glass.1.ogg b/mods/mcl_core/sounds/default_break_glass.1.ogg similarity index 100% rename from mods/default/sounds/default_break_glass.1.ogg rename to mods/mcl_core/sounds/default_break_glass.1.ogg diff --git a/mods/default/sounds/default_break_glass.2.ogg b/mods/mcl_core/sounds/default_break_glass.2.ogg similarity index 100% rename from mods/default/sounds/default_break_glass.2.ogg rename to mods/mcl_core/sounds/default_break_glass.2.ogg diff --git a/mods/default/sounds/default_break_glass.3.ogg b/mods/mcl_core/sounds/default_break_glass.3.ogg similarity index 100% rename from mods/default/sounds/default_break_glass.3.ogg rename to mods/mcl_core/sounds/default_break_glass.3.ogg diff --git a/mods/default/sounds/default_cool_lava.1.ogg b/mods/mcl_core/sounds/default_cool_lava.1.ogg similarity index 100% rename from mods/default/sounds/default_cool_lava.1.ogg rename to mods/mcl_core/sounds/default_cool_lava.1.ogg diff --git a/mods/default/sounds/default_cool_lava.2.ogg b/mods/mcl_core/sounds/default_cool_lava.2.ogg similarity index 100% rename from mods/default/sounds/default_cool_lava.2.ogg rename to mods/mcl_core/sounds/default_cool_lava.2.ogg diff --git a/mods/default/sounds/default_cool_lava.3.ogg b/mods/mcl_core/sounds/default_cool_lava.3.ogg similarity index 100% rename from mods/default/sounds/default_cool_lava.3.ogg rename to mods/mcl_core/sounds/default_cool_lava.3.ogg diff --git a/mods/default/sounds/default_dig_choppy.ogg b/mods/mcl_core/sounds/default_dig_choppy.ogg similarity index 100% rename from mods/default/sounds/default_dig_choppy.ogg rename to mods/mcl_core/sounds/default_dig_choppy.ogg diff --git a/mods/default/sounds/default_dig_cracky.ogg b/mods/mcl_core/sounds/default_dig_cracky.ogg similarity index 100% rename from mods/default/sounds/default_dig_cracky.ogg rename to mods/mcl_core/sounds/default_dig_cracky.ogg diff --git a/mods/default/sounds/default_dig_crumbly.ogg b/mods/mcl_core/sounds/default_dig_crumbly.ogg similarity index 100% rename from mods/default/sounds/default_dig_crumbly.ogg rename to mods/mcl_core/sounds/default_dig_crumbly.ogg diff --git a/mods/default/sounds/default_dig_dig_immediate.ogg b/mods/mcl_core/sounds/default_dig_dig_immediate.ogg similarity index 100% rename from mods/default/sounds/default_dig_dig_immediate.ogg rename to mods/mcl_core/sounds/default_dig_dig_immediate.ogg diff --git a/mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg b/mods/mcl_core/sounds/default_dig_oddly_breakable_by_hand.ogg similarity index 100% rename from mods/default/sounds/default_dig_oddly_breakable_by_hand.ogg rename to mods/mcl_core/sounds/default_dig_oddly_breakable_by_hand.ogg diff --git a/mods/default/sounds/default_dirt_footstep.1.ogg b/mods/mcl_core/sounds/default_dirt_footstep.1.ogg similarity index 100% rename from mods/default/sounds/default_dirt_footstep.1.ogg rename to mods/mcl_core/sounds/default_dirt_footstep.1.ogg diff --git a/mods/default/sounds/default_dirt_footstep.2.ogg b/mods/mcl_core/sounds/default_dirt_footstep.2.ogg similarity index 100% rename from mods/default/sounds/default_dirt_footstep.2.ogg rename to mods/mcl_core/sounds/default_dirt_footstep.2.ogg diff --git a/mods/default/sounds/default_dug_node.1.ogg b/mods/mcl_core/sounds/default_dug_node.1.ogg similarity index 100% rename from mods/default/sounds/default_dug_node.1.ogg rename to mods/mcl_core/sounds/default_dug_node.1.ogg diff --git a/mods/default/sounds/default_dug_node.2.ogg b/mods/mcl_core/sounds/default_dug_node.2.ogg similarity index 100% rename from mods/default/sounds/default_dug_node.2.ogg rename to mods/mcl_core/sounds/default_dug_node.2.ogg diff --git a/mods/default/sounds/default_glass_footstep.ogg b/mods/mcl_core/sounds/default_glass_footstep.ogg similarity index 100% rename from mods/default/sounds/default_glass_footstep.ogg rename to mods/mcl_core/sounds/default_glass_footstep.ogg diff --git a/mods/default/sounds/default_grass_footstep.1.ogg b/mods/mcl_core/sounds/default_grass_footstep.1.ogg similarity index 100% rename from mods/default/sounds/default_grass_footstep.1.ogg rename to mods/mcl_core/sounds/default_grass_footstep.1.ogg diff --git a/mods/default/sounds/default_grass_footstep.2.ogg b/mods/mcl_core/sounds/default_grass_footstep.2.ogg similarity index 100% rename from mods/default/sounds/default_grass_footstep.2.ogg rename to mods/mcl_core/sounds/default_grass_footstep.2.ogg diff --git a/mods/default/sounds/default_grass_footstep.3.ogg b/mods/mcl_core/sounds/default_grass_footstep.3.ogg similarity index 100% rename from mods/default/sounds/default_grass_footstep.3.ogg rename to mods/mcl_core/sounds/default_grass_footstep.3.ogg diff --git a/mods/default/sounds/default_gravel_footstep.1.ogg b/mods/mcl_core/sounds/default_gravel_footstep.1.ogg similarity index 100% rename from mods/default/sounds/default_gravel_footstep.1.ogg rename to mods/mcl_core/sounds/default_gravel_footstep.1.ogg diff --git a/mods/default/sounds/default_gravel_footstep.2.ogg b/mods/mcl_core/sounds/default_gravel_footstep.2.ogg similarity index 100% rename from mods/default/sounds/default_gravel_footstep.2.ogg rename to mods/mcl_core/sounds/default_gravel_footstep.2.ogg diff --git a/mods/default/sounds/default_gravel_footstep.3.ogg b/mods/mcl_core/sounds/default_gravel_footstep.3.ogg similarity index 100% rename from mods/default/sounds/default_gravel_footstep.3.ogg rename to mods/mcl_core/sounds/default_gravel_footstep.3.ogg diff --git a/mods/default/sounds/default_gravel_footstep.4.ogg b/mods/mcl_core/sounds/default_gravel_footstep.4.ogg similarity index 100% rename from mods/default/sounds/default_gravel_footstep.4.ogg rename to mods/mcl_core/sounds/default_gravel_footstep.4.ogg diff --git a/mods/default/sounds/default_hard_footstep.1.ogg b/mods/mcl_core/sounds/default_hard_footstep.1.ogg similarity index 100% rename from mods/default/sounds/default_hard_footstep.1.ogg rename to mods/mcl_core/sounds/default_hard_footstep.1.ogg diff --git a/mods/default/sounds/default_hard_footstep.2.ogg b/mods/mcl_core/sounds/default_hard_footstep.2.ogg similarity index 100% rename from mods/default/sounds/default_hard_footstep.2.ogg rename to mods/mcl_core/sounds/default_hard_footstep.2.ogg diff --git a/mods/default/sounds/default_hard_footstep.3.ogg b/mods/mcl_core/sounds/default_hard_footstep.3.ogg similarity index 100% rename from mods/default/sounds/default_hard_footstep.3.ogg rename to mods/mcl_core/sounds/default_hard_footstep.3.ogg diff --git a/mods/default/sounds/default_place_node.1.ogg b/mods/mcl_core/sounds/default_place_node.1.ogg similarity index 100% rename from mods/default/sounds/default_place_node.1.ogg rename to mods/mcl_core/sounds/default_place_node.1.ogg diff --git a/mods/default/sounds/default_place_node.2.ogg b/mods/mcl_core/sounds/default_place_node.2.ogg similarity index 100% rename from mods/default/sounds/default_place_node.2.ogg rename to mods/mcl_core/sounds/default_place_node.2.ogg diff --git a/mods/default/sounds/default_place_node.3.ogg b/mods/mcl_core/sounds/default_place_node.3.ogg similarity index 100% rename from mods/default/sounds/default_place_node.3.ogg rename to mods/mcl_core/sounds/default_place_node.3.ogg diff --git a/mods/default/sounds/default_place_node_hard.1.ogg b/mods/mcl_core/sounds/default_place_node_hard.1.ogg similarity index 100% rename from mods/default/sounds/default_place_node_hard.1.ogg rename to mods/mcl_core/sounds/default_place_node_hard.1.ogg diff --git a/mods/default/sounds/default_place_node_hard.2.ogg b/mods/mcl_core/sounds/default_place_node_hard.2.ogg similarity index 100% rename from mods/default/sounds/default_place_node_hard.2.ogg rename to mods/mcl_core/sounds/default_place_node_hard.2.ogg diff --git a/mods/default/sounds/default_sand_footstep.1.ogg b/mods/mcl_core/sounds/default_sand_footstep.1.ogg similarity index 100% rename from mods/default/sounds/default_sand_footstep.1.ogg rename to mods/mcl_core/sounds/default_sand_footstep.1.ogg diff --git a/mods/default/sounds/default_sand_footstep.2.ogg b/mods/mcl_core/sounds/default_sand_footstep.2.ogg similarity index 100% rename from mods/default/sounds/default_sand_footstep.2.ogg rename to mods/mcl_core/sounds/default_sand_footstep.2.ogg diff --git a/mods/default/sounds/default_snow_footstep.1.ogg b/mods/mcl_core/sounds/default_snow_footstep.1.ogg similarity index 100% rename from mods/default/sounds/default_snow_footstep.1.ogg rename to mods/mcl_core/sounds/default_snow_footstep.1.ogg diff --git a/mods/default/sounds/default_snow_footstep.2.ogg b/mods/mcl_core/sounds/default_snow_footstep.2.ogg similarity index 100% rename from mods/default/sounds/default_snow_footstep.2.ogg rename to mods/mcl_core/sounds/default_snow_footstep.2.ogg diff --git a/mods/default/sounds/default_snow_footstep.3.ogg b/mods/mcl_core/sounds/default_snow_footstep.3.ogg similarity index 100% rename from mods/default/sounds/default_snow_footstep.3.ogg rename to mods/mcl_core/sounds/default_snow_footstep.3.ogg diff --git a/mods/default/sounds/default_tool_break.ogg b/mods/mcl_core/sounds/default_tool_break.ogg similarity index 100% rename from mods/default/sounds/default_tool_break.ogg rename to mods/mcl_core/sounds/default_tool_break.ogg diff --git a/mods/default/sounds/default_wood_footstep.1.ogg b/mods/mcl_core/sounds/default_wood_footstep.1.ogg similarity index 100% rename from mods/default/sounds/default_wood_footstep.1.ogg rename to mods/mcl_core/sounds/default_wood_footstep.1.ogg diff --git a/mods/default/sounds/default_wood_footstep.2.ogg b/mods/mcl_core/sounds/default_wood_footstep.2.ogg similarity index 100% rename from mods/default/sounds/default_wood_footstep.2.ogg rename to mods/mcl_core/sounds/default_wood_footstep.2.ogg diff --git a/mods/default/textures/bubble.png b/mods/mcl_core/textures/bubble.png similarity index 100% rename from mods/default/textures/bubble.png rename to mods/mcl_core/textures/bubble.png diff --git a/mods/default/textures/crack_anylength.png b/mods/mcl_core/textures/crack_anylength.png similarity index 100% rename from mods/default/textures/crack_anylength.png rename to mods/mcl_core/textures/crack_anylength.png diff --git a/mods/default/textures/crafting_inventory_furnace.png b/mods/mcl_core/textures/crafting_inventory_furnace.png similarity index 100% rename from mods/default/textures/crafting_inventory_furnace.png rename to mods/mcl_core/textures/crafting_inventory_furnace.png diff --git a/mods/default/textures/crafting_inventory_furnace_on.png b/mods/mcl_core/textures/crafting_inventory_furnace_on.png similarity index 100% rename from mods/default/textures/crafting_inventory_furnace_on.png rename to mods/mcl_core/textures/crafting_inventory_furnace_on.png diff --git a/mods/default/textures/crosshair.png b/mods/mcl_core/textures/crosshair.png similarity index 100% rename from mods/default/textures/crosshair.png rename to mods/mcl_core/textures/crosshair.png diff --git a/mods/default/textures/default_acacialeaves.png b/mods/mcl_core/textures/default_acacialeaves.png similarity index 100% rename from mods/default/textures/default_acacialeaves.png rename to mods/mcl_core/textures/default_acacialeaves.png diff --git a/mods/default/textures/default_acaciasapling.png b/mods/mcl_core/textures/default_acaciasapling.png similarity index 100% rename from mods/default/textures/default_acaciasapling.png rename to mods/mcl_core/textures/default_acaciasapling.png diff --git a/mods/default/textures/default_acaciatree.png b/mods/mcl_core/textures/default_acaciatree.png similarity index 100% rename from mods/default/textures/default_acaciatree.png rename to mods/mcl_core/textures/default_acaciatree.png diff --git a/mods/default/textures/default_acaciatree_top.png b/mods/mcl_core/textures/default_acaciatree_top.png similarity index 100% rename from mods/default/textures/default_acaciatree_top.png rename to mods/mcl_core/textures/default_acaciatree_top.png diff --git a/mods/default/textures/default_acaciawood.png b/mods/mcl_core/textures/default_acaciawood.png similarity index 100% rename from mods/default/textures/default_acaciawood.png rename to mods/mcl_core/textures/default_acaciawood.png diff --git a/mods/default/textures/default_andesite.png b/mods/mcl_core/textures/default_andesite.png similarity index 100% rename from mods/default/textures/default_andesite.png rename to mods/mcl_core/textures/default_andesite.png diff --git a/mods/default/textures/default_andesite_smooth.png b/mods/mcl_core/textures/default_andesite_smooth.png similarity index 100% rename from mods/default/textures/default_andesite_smooth.png rename to mods/mcl_core/textures/default_andesite_smooth.png diff --git a/mods/default/textures/default_apple.png b/mods/mcl_core/textures/default_apple.png similarity index 100% rename from mods/default/textures/default_apple.png rename to mods/mcl_core/textures/default_apple.png diff --git a/mods/default/textures/default_apple_gold.png b/mods/mcl_core/textures/default_apple_gold.png similarity index 100% rename from mods/default/textures/default_apple_gold.png rename to mods/mcl_core/textures/default_apple_gold.png diff --git a/mods/default/textures/default_barrier.png b/mods/mcl_core/textures/default_barrier.png similarity index 100% rename from mods/default/textures/default_barrier.png rename to mods/mcl_core/textures/default_barrier.png diff --git a/mods/default/textures/default_bedrock.png b/mods/mcl_core/textures/default_bedrock.png similarity index 100% rename from mods/default/textures/default_bedrock.png rename to mods/mcl_core/textures/default_bedrock.png diff --git a/mods/default/textures/default_bone.png b/mods/mcl_core/textures/default_bone.png similarity index 100% rename from mods/default/textures/default_bone.png rename to mods/mcl_core/textures/default_bone.png diff --git a/mods/default/textures/default_book.png b/mods/mcl_core/textures/default_book.png similarity index 100% rename from mods/default/textures/default_book.png rename to mods/mcl_core/textures/default_book.png diff --git a/mods/default/textures/default_bookshelf.png b/mods/mcl_core/textures/default_bookshelf.png similarity index 100% rename from mods/default/textures/default_bookshelf.png rename to mods/mcl_core/textures/default_bookshelf.png diff --git a/mods/default/textures/default_bowl.png b/mods/mcl_core/textures/default_bowl.png similarity index 100% rename from mods/default/textures/default_bowl.png rename to mods/mcl_core/textures/default_bowl.png diff --git a/mods/default/textures/default_brick.png b/mods/mcl_core/textures/default_brick.png similarity index 100% rename from mods/default/textures/default_brick.png rename to mods/mcl_core/textures/default_brick.png diff --git a/mods/default/textures/default_cactus_bottom.png b/mods/mcl_core/textures/default_cactus_bottom.png similarity index 100% rename from mods/default/textures/default_cactus_bottom.png rename to mods/mcl_core/textures/default_cactus_bottom.png diff --git a/mods/default/textures/default_cactus_side.png b/mods/mcl_core/textures/default_cactus_side.png similarity index 100% rename from mods/default/textures/default_cactus_side.png rename to mods/mcl_core/textures/default_cactus_side.png diff --git a/mods/default/textures/default_cactus_top.png b/mods/mcl_core/textures/default_cactus_top.png similarity index 100% rename from mods/default/textures/default_cactus_top.png rename to mods/mcl_core/textures/default_cactus_top.png diff --git a/mods/default/textures/default_charcoal_lump.png b/mods/mcl_core/textures/default_charcoal_lump.png similarity index 100% rename from mods/default/textures/default_charcoal_lump.png rename to mods/mcl_core/textures/default_charcoal_lump.png diff --git a/mods/default/textures/default_clay.png b/mods/mcl_core/textures/default_clay.png similarity index 100% rename from mods/default/textures/default_clay.png rename to mods/mcl_core/textures/default_clay.png diff --git a/mods/default/textures/default_clay_brick.png b/mods/mcl_core/textures/default_clay_brick.png similarity index 100% rename from mods/default/textures/default_clay_brick.png rename to mods/mcl_core/textures/default_clay_brick.png diff --git a/mods/default/textures/default_clay_lump.png b/mods/mcl_core/textures/default_clay_lump.png similarity index 100% rename from mods/default/textures/default_clay_lump.png rename to mods/mcl_core/textures/default_clay_lump.png diff --git a/mods/default/textures/default_coal_block.png b/mods/mcl_core/textures/default_coal_block.png similarity index 100% rename from mods/default/textures/default_coal_block.png rename to mods/mcl_core/textures/default_coal_block.png diff --git a/mods/default/textures/default_coal_lump.png b/mods/mcl_core/textures/default_coal_lump.png similarity index 100% rename from mods/default/textures/default_coal_lump.png rename to mods/mcl_core/textures/default_coal_lump.png diff --git a/mods/default/textures/default_coarse_dirt.png b/mods/mcl_core/textures/default_coarse_dirt.png similarity index 100% rename from mods/default/textures/default_coarse_dirt.png rename to mods/mcl_core/textures/default_coarse_dirt.png diff --git a/mods/default/textures/default_cobble.png b/mods/mcl_core/textures/default_cobble.png similarity index 100% rename from mods/default/textures/default_cobble.png rename to mods/mcl_core/textures/default_cobble.png diff --git a/mods/default/textures/default_diamond.png b/mods/mcl_core/textures/default_diamond.png similarity index 100% rename from mods/default/textures/default_diamond.png rename to mods/mcl_core/textures/default_diamond.png diff --git a/mods/default/textures/default_diamond_block.png b/mods/mcl_core/textures/default_diamond_block.png similarity index 100% rename from mods/default/textures/default_diamond_block.png rename to mods/mcl_core/textures/default_diamond_block.png diff --git a/mods/default/textures/default_diorite.png b/mods/mcl_core/textures/default_diorite.png similarity index 100% rename from mods/default/textures/default_diorite.png rename to mods/mcl_core/textures/default_diorite.png diff --git a/mods/default/textures/default_diorite_smooth.png b/mods/mcl_core/textures/default_diorite_smooth.png similarity index 100% rename from mods/default/textures/default_diorite_smooth.png rename to mods/mcl_core/textures/default_diorite_smooth.png diff --git a/mods/default/textures/default_dirt.png b/mods/mcl_core/textures/default_dirt.png similarity index 100% rename from mods/default/textures/default_dirt.png rename to mods/mcl_core/textures/default_dirt.png diff --git a/mods/default/textures/default_dirt_podzol_side.png b/mods/mcl_core/textures/default_dirt_podzol_side.png similarity index 100% rename from mods/default/textures/default_dirt_podzol_side.png rename to mods/mcl_core/textures/default_dirt_podzol_side.png diff --git a/mods/default/textures/default_dirt_podzol_top.png b/mods/mcl_core/textures/default_dirt_podzol_top.png similarity index 100% rename from mods/default/textures/default_dirt_podzol_top.png rename to mods/mcl_core/textures/default_dirt_podzol_top.png diff --git a/mods/default/textures/default_dry_shrub.png b/mods/mcl_core/textures/default_dry_shrub.png similarity index 100% rename from mods/default/textures/default_dry_shrub.png rename to mods/mcl_core/textures/default_dry_shrub.png diff --git a/mods/default/textures/default_emerald.png b/mods/mcl_core/textures/default_emerald.png similarity index 100% rename from mods/default/textures/default_emerald.png rename to mods/mcl_core/textures/default_emerald.png diff --git a/mods/default/textures/default_emerald_block.png b/mods/mcl_core/textures/default_emerald_block.png similarity index 100% rename from mods/default/textures/default_emerald_block.png rename to mods/mcl_core/textures/default_emerald_block.png diff --git a/mods/default/textures/default_fire_particle1.png b/mods/mcl_core/textures/default_fire_particle1.png similarity index 100% rename from mods/default/textures/default_fire_particle1.png rename to mods/mcl_core/textures/default_fire_particle1.png diff --git a/mods/default/textures/default_fire_particle2.png b/mods/mcl_core/textures/default_fire_particle2.png similarity index 100% rename from mods/default/textures/default_fire_particle2.png rename to mods/mcl_core/textures/default_fire_particle2.png diff --git a/mods/default/textures/default_fish.png b/mods/mcl_core/textures/default_fish.png similarity index 100% rename from mods/default/textures/default_fish.png rename to mods/mcl_core/textures/default_fish.png diff --git a/mods/default/textures/default_fish_cooked.png b/mods/mcl_core/textures/default_fish_cooked.png similarity index 100% rename from mods/default/textures/default_fish_cooked.png rename to mods/mcl_core/textures/default_fish_cooked.png diff --git a/mods/default/textures/default_flint.png b/mods/mcl_core/textures/default_flint.png similarity index 100% rename from mods/default/textures/default_flint.png rename to mods/mcl_core/textures/default_flint.png diff --git a/mods/default/textures/default_frosted_ice_0.png b/mods/mcl_core/textures/default_frosted_ice_0.png similarity index 100% rename from mods/default/textures/default_frosted_ice_0.png rename to mods/mcl_core/textures/default_frosted_ice_0.png diff --git a/mods/default/textures/default_frosted_ice_1.png b/mods/mcl_core/textures/default_frosted_ice_1.png similarity index 100% rename from mods/default/textures/default_frosted_ice_1.png rename to mods/mcl_core/textures/default_frosted_ice_1.png diff --git a/mods/default/textures/default_frosted_ice_2.png b/mods/mcl_core/textures/default_frosted_ice_2.png similarity index 100% rename from mods/default/textures/default_frosted_ice_2.png rename to mods/mcl_core/textures/default_frosted_ice_2.png diff --git a/mods/default/textures/default_frosted_ice_3.png b/mods/mcl_core/textures/default_frosted_ice_3.png similarity index 100% rename from mods/default/textures/default_frosted_ice_3.png rename to mods/mcl_core/textures/default_frosted_ice_3.png diff --git a/mods/default/textures/default_glass.png b/mods/mcl_core/textures/default_glass.png similarity index 100% rename from mods/default/textures/default_glass.png rename to mods/mcl_core/textures/default_glass.png diff --git a/mods/default/textures/default_glowstone.png b/mods/mcl_core/textures/default_glowstone.png similarity index 100% rename from mods/default/textures/default_glowstone.png rename to mods/mcl_core/textures/default_glowstone.png diff --git a/mods/default/textures/default_glowstone_dust.png b/mods/mcl_core/textures/default_glowstone_dust.png similarity index 100% rename from mods/default/textures/default_glowstone_dust.png rename to mods/mcl_core/textures/default_glowstone_dust.png diff --git a/mods/default/textures/default_gold_block.png b/mods/mcl_core/textures/default_gold_block.png similarity index 100% rename from mods/default/textures/default_gold_block.png rename to mods/mcl_core/textures/default_gold_block.png diff --git a/mods/default/textures/default_gold_ingot.png b/mods/mcl_core/textures/default_gold_ingot.png similarity index 100% rename from mods/default/textures/default_gold_ingot.png rename to mods/mcl_core/textures/default_gold_ingot.png diff --git a/mods/default/textures/default_gold_nugget.png b/mods/mcl_core/textures/default_gold_nugget.png similarity index 100% rename from mods/default/textures/default_gold_nugget.png rename to mods/mcl_core/textures/default_gold_nugget.png diff --git a/mods/default/textures/default_granite.png b/mods/mcl_core/textures/default_granite.png similarity index 100% rename from mods/default/textures/default_granite.png rename to mods/mcl_core/textures/default_granite.png diff --git a/mods/default/textures/default_granite_smooth.png b/mods/mcl_core/textures/default_granite_smooth.png similarity index 100% rename from mods/default/textures/default_granite_smooth.png rename to mods/mcl_core/textures/default_granite_smooth.png diff --git a/mods/default/textures/default_grass.png b/mods/mcl_core/textures/default_grass.png similarity index 100% rename from mods/default/textures/default_grass.png rename to mods/mcl_core/textures/default_grass.png diff --git a/mods/default/textures/default_grass_side.png b/mods/mcl_core/textures/default_grass_side.png similarity index 100% rename from mods/default/textures/default_grass_side.png rename to mods/mcl_core/textures/default_grass_side.png diff --git a/mods/default/textures/default_gravel.png b/mods/mcl_core/textures/default_gravel.png similarity index 100% rename from mods/default/textures/default_gravel.png rename to mods/mcl_core/textures/default_gravel.png diff --git a/mods/default/textures/default_gunpowder.png b/mods/mcl_core/textures/default_gunpowder.png similarity index 100% rename from mods/default/textures/default_gunpowder.png rename to mods/mcl_core/textures/default_gunpowder.png diff --git a/mods/default/textures/default_hayblock_side.png b/mods/mcl_core/textures/default_hayblock_side.png similarity index 100% rename from mods/default/textures/default_hayblock_side.png rename to mods/mcl_core/textures/default_hayblock_side.png diff --git a/mods/default/textures/default_hayblock_top.png b/mods/mcl_core/textures/default_hayblock_top.png similarity index 100% rename from mods/default/textures/default_hayblock_top.png rename to mods/mcl_core/textures/default_hayblock_top.png diff --git a/mods/default/textures/default_ice.png b/mods/mcl_core/textures/default_ice.png similarity index 100% rename from mods/default/textures/default_ice.png rename to mods/mcl_core/textures/default_ice.png diff --git a/mods/default/textures/default_ice_packed.png b/mods/mcl_core/textures/default_ice_packed.png similarity index 100% rename from mods/default/textures/default_ice_packed.png rename to mods/mcl_core/textures/default_ice_packed.png diff --git a/mods/default/textures/default_iron_nugget.png b/mods/mcl_core/textures/default_iron_nugget.png similarity index 100% rename from mods/default/textures/default_iron_nugget.png rename to mods/mcl_core/textures/default_iron_nugget.png diff --git a/mods/default/textures/default_junglegrass.png b/mods/mcl_core/textures/default_junglegrass.png similarity index 100% rename from mods/default/textures/default_junglegrass.png rename to mods/mcl_core/textures/default_junglegrass.png diff --git a/mods/default/textures/default_jungleleaves.png b/mods/mcl_core/textures/default_jungleleaves.png similarity index 100% rename from mods/default/textures/default_jungleleaves.png rename to mods/mcl_core/textures/default_jungleleaves.png diff --git a/mods/default/textures/default_junglesapling.png b/mods/mcl_core/textures/default_junglesapling.png similarity index 100% rename from mods/default/textures/default_junglesapling.png rename to mods/mcl_core/textures/default_junglesapling.png diff --git a/mods/default/textures/default_jungletree.png b/mods/mcl_core/textures/default_jungletree.png similarity index 100% rename from mods/default/textures/default_jungletree.png rename to mods/mcl_core/textures/default_jungletree.png diff --git a/mods/default/textures/default_jungletree_top.png b/mods/mcl_core/textures/default_jungletree_top.png similarity index 100% rename from mods/default/textures/default_jungletree_top.png rename to mods/mcl_core/textures/default_jungletree_top.png diff --git a/mods/default/textures/default_junglewood.png b/mods/mcl_core/textures/default_junglewood.png similarity index 100% rename from mods/default/textures/default_junglewood.png rename to mods/mcl_core/textures/default_junglewood.png diff --git a/mods/default/textures/default_ladder.png b/mods/mcl_core/textures/default_ladder.png similarity index 100% rename from mods/default/textures/default_ladder.png rename to mods/mcl_core/textures/default_ladder.png diff --git a/mods/default/textures/default_lapis_block.png b/mods/mcl_core/textures/default_lapis_block.png similarity index 100% rename from mods/default/textures/default_lapis_block.png rename to mods/mcl_core/textures/default_lapis_block.png diff --git a/mods/default/textures/default_large_chest_bg.png b/mods/mcl_core/textures/default_large_chest_bg.png similarity index 100% rename from mods/default/textures/default_large_chest_bg.png rename to mods/mcl_core/textures/default_large_chest_bg.png diff --git a/mods/default/textures/default_lava.png b/mods/mcl_core/textures/default_lava.png similarity index 100% rename from mods/default/textures/default_lava.png rename to mods/mcl_core/textures/default_lava.png diff --git a/mods/default/textures/default_lava_flowing_animated.png b/mods/mcl_core/textures/default_lava_flowing_animated.png similarity index 100% rename from mods/default/textures/default_lava_flowing_animated.png rename to mods/mcl_core/textures/default_lava_flowing_animated.png diff --git a/mods/default/textures/default_lava_source_animated.png b/mods/mcl_core/textures/default_lava_source_animated.png similarity index 100% rename from mods/default/textures/default_lava_source_animated.png rename to mods/mcl_core/textures/default_lava_source_animated.png diff --git a/mods/default/textures/default_leaves.png b/mods/mcl_core/textures/default_leaves.png similarity index 100% rename from mods/default/textures/default_leaves.png rename to mods/mcl_core/textures/default_leaves.png diff --git a/mods/default/textures/default_leaves_big_oak.png b/mods/mcl_core/textures/default_leaves_big_oak.png similarity index 100% rename from mods/default/textures/default_leaves_big_oak.png rename to mods/mcl_core/textures/default_leaves_big_oak.png diff --git a/mods/default/textures/default_leaves_birch.png b/mods/mcl_core/textures/default_leaves_birch.png similarity index 100% rename from mods/default/textures/default_leaves_birch.png rename to mods/mcl_core/textures/default_leaves_birch.png diff --git a/mods/default/textures/default_log_big_oak.png b/mods/mcl_core/textures/default_log_big_oak.png similarity index 100% rename from mods/default/textures/default_log_big_oak.png rename to mods/mcl_core/textures/default_log_big_oak.png diff --git a/mods/default/textures/default_log_big_oak_top.png b/mods/mcl_core/textures/default_log_big_oak_top.png similarity index 100% rename from mods/default/textures/default_log_big_oak_top.png rename to mods/mcl_core/textures/default_log_big_oak_top.png diff --git a/mods/default/textures/default_log_birch.png b/mods/mcl_core/textures/default_log_birch.png similarity index 100% rename from mods/default/textures/default_log_birch.png rename to mods/mcl_core/textures/default_log_birch.png diff --git a/mods/default/textures/default_log_birch_top.png b/mods/mcl_core/textures/default_log_birch_top.png similarity index 100% rename from mods/default/textures/default_log_birch_top.png rename to mods/mcl_core/textures/default_log_birch_top.png diff --git a/mods/default/textures/default_mineral_coal.png b/mods/mcl_core/textures/default_mineral_coal.png similarity index 100% rename from mods/default/textures/default_mineral_coal.png rename to mods/mcl_core/textures/default_mineral_coal.png diff --git a/mods/default/textures/default_mineral_diamond.png b/mods/mcl_core/textures/default_mineral_diamond.png similarity index 100% rename from mods/default/textures/default_mineral_diamond.png rename to mods/mcl_core/textures/default_mineral_diamond.png diff --git a/mods/default/textures/default_mineral_emerald.png b/mods/mcl_core/textures/default_mineral_emerald.png similarity index 100% rename from mods/default/textures/default_mineral_emerald.png rename to mods/mcl_core/textures/default_mineral_emerald.png diff --git a/mods/default/textures/default_mineral_gold.png b/mods/mcl_core/textures/default_mineral_gold.png similarity index 100% rename from mods/default/textures/default_mineral_gold.png rename to mods/mcl_core/textures/default_mineral_gold.png diff --git a/mods/default/textures/default_mineral_iron.png b/mods/mcl_core/textures/default_mineral_iron.png similarity index 100% rename from mods/default/textures/default_mineral_iron.png rename to mods/mcl_core/textures/default_mineral_iron.png diff --git a/mods/default/textures/default_mineral_lapis.png b/mods/mcl_core/textures/default_mineral_lapis.png similarity index 100% rename from mods/default/textures/default_mineral_lapis.png rename to mods/mcl_core/textures/default_mineral_lapis.png diff --git a/mods/default/textures/default_mineral_redstone.png b/mods/mcl_core/textures/default_mineral_redstone.png similarity index 100% rename from mods/default/textures/default_mineral_redstone.png rename to mods/mcl_core/textures/default_mineral_redstone.png diff --git a/mods/default/textures/default_mossycobble.png b/mods/mcl_core/textures/default_mossycobble.png similarity index 100% rename from mods/default/textures/default_mossycobble.png rename to mods/mcl_core/textures/default_mossycobble.png diff --git a/mods/default/textures/default_mycelium_side.png b/mods/mcl_core/textures/default_mycelium_side.png similarity index 100% rename from mods/default/textures/default_mycelium_side.png rename to mods/mcl_core/textures/default_mycelium_side.png diff --git a/mods/default/textures/default_mycelium_top.png b/mods/mcl_core/textures/default_mycelium_top.png similarity index 100% rename from mods/default/textures/default_mycelium_top.png rename to mods/mcl_core/textures/default_mycelium_top.png diff --git a/mods/default/textures/default_obsidian.png b/mods/mcl_core/textures/default_obsidian.png similarity index 100% rename from mods/default/textures/default_obsidian.png rename to mods/mcl_core/textures/default_obsidian.png diff --git a/mods/default/textures/default_paper.png b/mods/mcl_core/textures/default_paper.png similarity index 100% rename from mods/default/textures/default_paper.png rename to mods/mcl_core/textures/default_paper.png diff --git a/mods/default/textures/default_papyrus.png b/mods/mcl_core/textures/default_papyrus.png similarity index 100% rename from mods/default/textures/default_papyrus.png rename to mods/mcl_core/textures/default_papyrus.png diff --git a/mods/default/textures/default_planks_big_oak.png b/mods/mcl_core/textures/default_planks_big_oak.png similarity index 100% rename from mods/default/textures/default_planks_big_oak.png rename to mods/mcl_core/textures/default_planks_big_oak.png diff --git a/mods/default/textures/default_planks_birch.png b/mods/mcl_core/textures/default_planks_birch.png similarity index 100% rename from mods/default/textures/default_planks_birch.png rename to mods/mcl_core/textures/default_planks_birch.png diff --git a/mods/default/textures/default_prismarine_anim.png b/mods/mcl_core/textures/default_prismarine_anim.png similarity index 100% rename from mods/default/textures/default_prismarine_anim.png rename to mods/mcl_core/textures/default_prismarine_anim.png diff --git a/mods/default/textures/default_prismarine_bricks.png b/mods/mcl_core/textures/default_prismarine_bricks.png similarity index 100% rename from mods/default/textures/default_prismarine_bricks.png rename to mods/mcl_core/textures/default_prismarine_bricks.png diff --git a/mods/default/textures/default_prismarine_crystals.png b/mods/mcl_core/textures/default_prismarine_crystals.png similarity index 100% rename from mods/default/textures/default_prismarine_crystals.png rename to mods/mcl_core/textures/default_prismarine_crystals.png diff --git a/mods/default/textures/default_prismarine_dark.png b/mods/mcl_core/textures/default_prismarine_dark.png similarity index 100% rename from mods/default/textures/default_prismarine_dark.png rename to mods/mcl_core/textures/default_prismarine_dark.png diff --git a/mods/default/textures/default_prismarine_shard.png b/mods/mcl_core/textures/default_prismarine_shard.png similarity index 100% rename from mods/default/textures/default_prismarine_shard.png rename to mods/mcl_core/textures/default_prismarine_shard.png diff --git a/mods/default/textures/default_quartz_block_bottom.png b/mods/mcl_core/textures/default_quartz_block_bottom.png similarity index 100% rename from mods/default/textures/default_quartz_block_bottom.png rename to mods/mcl_core/textures/default_quartz_block_bottom.png diff --git a/mods/default/textures/default_quartz_block_side.png b/mods/mcl_core/textures/default_quartz_block_side.png similarity index 100% rename from mods/default/textures/default_quartz_block_side.png rename to mods/mcl_core/textures/default_quartz_block_side.png diff --git a/mods/default/textures/default_quartz_block_top.png b/mods/mcl_core/textures/default_quartz_block_top.png similarity index 100% rename from mods/default/textures/default_quartz_block_top.png rename to mods/mcl_core/textures/default_quartz_block_top.png diff --git a/mods/default/textures/default_quartz_chiseled_side.png b/mods/mcl_core/textures/default_quartz_chiseled_side.png similarity index 100% rename from mods/default/textures/default_quartz_chiseled_side.png rename to mods/mcl_core/textures/default_quartz_chiseled_side.png diff --git a/mods/default/textures/default_quartz_chiseled_top.png b/mods/mcl_core/textures/default_quartz_chiseled_top.png similarity index 100% rename from mods/default/textures/default_quartz_chiseled_top.png rename to mods/mcl_core/textures/default_quartz_chiseled_top.png diff --git a/mods/default/textures/default_quartz_crystal.png b/mods/mcl_core/textures/default_quartz_crystal.png similarity index 100% rename from mods/default/textures/default_quartz_crystal.png rename to mods/mcl_core/textures/default_quartz_crystal.png diff --git a/mods/default/textures/default_quartz_ore.png b/mods/mcl_core/textures/default_quartz_ore.png similarity index 100% rename from mods/default/textures/default_quartz_ore.png rename to mods/mcl_core/textures/default_quartz_ore.png diff --git a/mods/default/textures/default_quartz_pillar_side.png b/mods/mcl_core/textures/default_quartz_pillar_side.png similarity index 100% rename from mods/default/textures/default_quartz_pillar_side.png rename to mods/mcl_core/textures/default_quartz_pillar_side.png diff --git a/mods/default/textures/default_quartz_pillar_top.png b/mods/mcl_core/textures/default_quartz_pillar_top.png similarity index 100% rename from mods/default/textures/default_quartz_pillar_top.png rename to mods/mcl_core/textures/default_quartz_pillar_top.png diff --git a/mods/default/textures/default_rail.png b/mods/mcl_core/textures/default_rail.png similarity index 100% rename from mods/default/textures/default_rail.png rename to mods/mcl_core/textures/default_rail.png diff --git a/mods/default/textures/default_rail_crossing.png b/mods/mcl_core/textures/default_rail_crossing.png similarity index 100% rename from mods/default/textures/default_rail_crossing.png rename to mods/mcl_core/textures/default_rail_crossing.png diff --git a/mods/default/textures/default_rail_curved.png b/mods/mcl_core/textures/default_rail_curved.png similarity index 100% rename from mods/default/textures/default_rail_curved.png rename to mods/mcl_core/textures/default_rail_curved.png diff --git a/mods/default/textures/default_rail_t_junction.png b/mods/mcl_core/textures/default_rail_t_junction.png similarity index 100% rename from mods/default/textures/default_rail_t_junction.png rename to mods/mcl_core/textures/default_rail_t_junction.png diff --git a/mods/default/textures/default_red_sand.png b/mods/mcl_core/textures/default_red_sand.png similarity index 100% rename from mods/default/textures/default_red_sand.png rename to mods/mcl_core/textures/default_red_sand.png diff --git a/mods/default/textures/default_redsandstone_bottom.png b/mods/mcl_core/textures/default_redsandstone_bottom.png similarity index 100% rename from mods/default/textures/default_redsandstone_bottom.png rename to mods/mcl_core/textures/default_redsandstone_bottom.png diff --git a/mods/default/textures/default_redsandstone_carved.png b/mods/mcl_core/textures/default_redsandstone_carved.png similarity index 100% rename from mods/default/textures/default_redsandstone_carved.png rename to mods/mcl_core/textures/default_redsandstone_carved.png diff --git a/mods/default/textures/default_redsandstone_normal.png b/mods/mcl_core/textures/default_redsandstone_normal.png similarity index 100% rename from mods/default/textures/default_redsandstone_normal.png rename to mods/mcl_core/textures/default_redsandstone_normal.png diff --git a/mods/default/textures/default_redsandstone_smooth.png b/mods/mcl_core/textures/default_redsandstone_smooth.png similarity index 100% rename from mods/default/textures/default_redsandstone_smooth.png rename to mods/mcl_core/textures/default_redsandstone_smooth.png diff --git a/mods/default/textures/default_redsandstone_top.png b/mods/mcl_core/textures/default_redsandstone_top.png similarity index 100% rename from mods/default/textures/default_redsandstone_top.png rename to mods/mcl_core/textures/default_redsandstone_top.png diff --git a/mods/default/textures/default_redstone_block.png b/mods/mcl_core/textures/default_redstone_block.png similarity index 100% rename from mods/default/textures/default_redstone_block.png rename to mods/mcl_core/textures/default_redstone_block.png diff --git a/mods/default/textures/default_sand.png b/mods/mcl_core/textures/default_sand.png similarity index 100% rename from mods/default/textures/default_sand.png rename to mods/mcl_core/textures/default_sand.png diff --git a/mods/default/textures/default_sandstone_bottom.png b/mods/mcl_core/textures/default_sandstone_bottom.png similarity index 100% rename from mods/default/textures/default_sandstone_bottom.png rename to mods/mcl_core/textures/default_sandstone_bottom.png diff --git a/mods/default/textures/default_sandstone_carved.png b/mods/mcl_core/textures/default_sandstone_carved.png similarity index 100% rename from mods/default/textures/default_sandstone_carved.png rename to mods/mcl_core/textures/default_sandstone_carved.png diff --git a/mods/default/textures/default_sandstone_normal.png b/mods/mcl_core/textures/default_sandstone_normal.png similarity index 100% rename from mods/default/textures/default_sandstone_normal.png rename to mods/mcl_core/textures/default_sandstone_normal.png diff --git a/mods/default/textures/default_sandstone_smooth.png b/mods/mcl_core/textures/default_sandstone_smooth.png similarity index 100% rename from mods/default/textures/default_sandstone_smooth.png rename to mods/mcl_core/textures/default_sandstone_smooth.png diff --git a/mods/default/textures/default_sandstone_top.png b/mods/mcl_core/textures/default_sandstone_top.png similarity index 100% rename from mods/default/textures/default_sandstone_top.png rename to mods/mcl_core/textures/default_sandstone_top.png diff --git a/mods/default/textures/default_sapling.png b/mods/mcl_core/textures/default_sapling.png similarity index 100% rename from mods/default/textures/default_sapling.png rename to mods/mcl_core/textures/default_sapling.png diff --git a/mods/default/textures/default_sapling_big_oak.png b/mods/mcl_core/textures/default_sapling_big_oak.png similarity index 100% rename from mods/default/textures/default_sapling_big_oak.png rename to mods/mcl_core/textures/default_sapling_big_oak.png diff --git a/mods/default/textures/default_sapling_birch.png b/mods/mcl_core/textures/default_sapling_birch.png similarity index 100% rename from mods/default/textures/default_sapling_birch.png rename to mods/mcl_core/textures/default_sapling_birch.png diff --git a/mods/default/textures/default_sea_lantern.png b/mods/mcl_core/textures/default_sea_lantern.png similarity index 100% rename from mods/default/textures/default_sea_lantern.png rename to mods/mcl_core/textures/default_sea_lantern.png diff --git a/mods/default/textures/default_sign.png b/mods/mcl_core/textures/default_sign.png similarity index 100% rename from mods/default/textures/default_sign.png rename to mods/mcl_core/textures/default_sign.png diff --git a/mods/default/textures/default_sign_wall.png b/mods/mcl_core/textures/default_sign_wall.png similarity index 100% rename from mods/default/textures/default_sign_wall.png rename to mods/mcl_core/textures/default_sign_wall.png diff --git a/mods/default/textures/default_slimeblock.png b/mods/mcl_core/textures/default_slimeblock.png similarity index 100% rename from mods/default/textures/default_slimeblock.png rename to mods/mcl_core/textures/default_slimeblock.png diff --git a/mods/default/textures/default_snow.png b/mods/mcl_core/textures/default_snow.png similarity index 100% rename from mods/default/textures/default_snow.png rename to mods/mcl_core/textures/default_snow.png diff --git a/mods/default/textures/default_sponge.png b/mods/mcl_core/textures/default_sponge.png similarity index 100% rename from mods/default/textures/default_sponge.png rename to mods/mcl_core/textures/default_sponge.png diff --git a/mods/default/textures/default_sponge_wet.png b/mods/mcl_core/textures/default_sponge_wet.png similarity index 100% rename from mods/default/textures/default_sponge_wet.png rename to mods/mcl_core/textures/default_sponge_wet.png diff --git a/mods/default/textures/default_spruceleaves.png b/mods/mcl_core/textures/default_spruceleaves.png similarity index 100% rename from mods/default/textures/default_spruceleaves.png rename to mods/mcl_core/textures/default_spruceleaves.png diff --git a/mods/default/textures/default_sprucesapling.png b/mods/mcl_core/textures/default_sprucesapling.png similarity index 100% rename from mods/default/textures/default_sprucesapling.png rename to mods/mcl_core/textures/default_sprucesapling.png diff --git a/mods/default/textures/default_sprucetree.png b/mods/mcl_core/textures/default_sprucetree.png similarity index 100% rename from mods/default/textures/default_sprucetree.png rename to mods/mcl_core/textures/default_sprucetree.png diff --git a/mods/default/textures/default_sprucetree_top.png b/mods/mcl_core/textures/default_sprucetree_top.png similarity index 100% rename from mods/default/textures/default_sprucetree_top.png rename to mods/mcl_core/textures/default_sprucetree_top.png diff --git a/mods/default/textures/default_sprucewood.png b/mods/mcl_core/textures/default_sprucewood.png similarity index 100% rename from mods/default/textures/default_sprucewood.png rename to mods/mcl_core/textures/default_sprucewood.png diff --git a/mods/default/textures/default_steel_block.png b/mods/mcl_core/textures/default_steel_block.png similarity index 100% rename from mods/default/textures/default_steel_block.png rename to mods/mcl_core/textures/default_steel_block.png diff --git a/mods/default/textures/default_steel_ingot.png b/mods/mcl_core/textures/default_steel_ingot.png similarity index 100% rename from mods/default/textures/default_steel_ingot.png rename to mods/mcl_core/textures/default_steel_ingot.png diff --git a/mods/default/textures/default_stick.png b/mods/mcl_core/textures/default_stick.png similarity index 100% rename from mods/default/textures/default_stick.png rename to mods/mcl_core/textures/default_stick.png diff --git a/mods/default/textures/default_stone.png b/mods/mcl_core/textures/default_stone.png similarity index 100% rename from mods/default/textures/default_stone.png rename to mods/mcl_core/textures/default_stone.png diff --git a/mods/default/textures/default_stone_brick.png b/mods/mcl_core/textures/default_stone_brick.png similarity index 100% rename from mods/default/textures/default_stone_brick.png rename to mods/mcl_core/textures/default_stone_brick.png diff --git a/mods/default/textures/default_stonebrick_carved.png b/mods/mcl_core/textures/default_stonebrick_carved.png similarity index 100% rename from mods/default/textures/default_stonebrick_carved.png rename to mods/mcl_core/textures/default_stonebrick_carved.png diff --git a/mods/default/textures/default_stonebrick_cracked.png b/mods/mcl_core/textures/default_stonebrick_cracked.png similarity index 100% rename from mods/default/textures/default_stonebrick_cracked.png rename to mods/mcl_core/textures/default_stonebrick_cracked.png diff --git a/mods/default/textures/default_stonebrick_mossy.png b/mods/mcl_core/textures/default_stonebrick_mossy.png similarity index 100% rename from mods/default/textures/default_stonebrick_mossy.png rename to mods/mcl_core/textures/default_stonebrick_mossy.png diff --git a/mods/default/textures/default_string.png b/mods/mcl_core/textures/default_string.png similarity index 100% rename from mods/default/textures/default_string.png rename to mods/mcl_core/textures/default_string.png diff --git a/mods/default/textures/default_sugar.png b/mods/mcl_core/textures/default_sugar.png similarity index 100% rename from mods/default/textures/default_sugar.png rename to mods/mcl_core/textures/default_sugar.png diff --git a/mods/default/textures/default_sugar_cane.png b/mods/mcl_core/textures/default_sugar_cane.png similarity index 100% rename from mods/default/textures/default_sugar_cane.png rename to mods/mcl_core/textures/default_sugar_cane.png diff --git a/mods/default/textures/default_sulphur.png b/mods/mcl_core/textures/default_sulphur.png similarity index 100% rename from mods/default/textures/default_sulphur.png rename to mods/mcl_core/textures/default_sulphur.png diff --git a/mods/default/textures/default_tallgrass.png b/mods/mcl_core/textures/default_tallgrass.png similarity index 100% rename from mods/default/textures/default_tallgrass.png rename to mods/mcl_core/textures/default_tallgrass.png diff --git a/mods/default/textures/default_tnt_bottom.png b/mods/mcl_core/textures/default_tnt_bottom.png similarity index 100% rename from mods/default/textures/default_tnt_bottom.png rename to mods/mcl_core/textures/default_tnt_bottom.png diff --git a/mods/default/textures/default_tnt_side.png b/mods/mcl_core/textures/default_tnt_side.png similarity index 100% rename from mods/default/textures/default_tnt_side.png rename to mods/mcl_core/textures/default_tnt_side.png diff --git a/mods/default/textures/default_tnt_top.png b/mods/mcl_core/textures/default_tnt_top.png similarity index 100% rename from mods/default/textures/default_tnt_top.png rename to mods/mcl_core/textures/default_tnt_top.png diff --git a/mods/default/textures/default_tool_diamondaxe.png b/mods/mcl_core/textures/default_tool_diamondaxe.png similarity index 100% rename from mods/default/textures/default_tool_diamondaxe.png rename to mods/mcl_core/textures/default_tool_diamondaxe.png diff --git a/mods/default/textures/default_tool_diamondpick.png b/mods/mcl_core/textures/default_tool_diamondpick.png similarity index 100% rename from mods/default/textures/default_tool_diamondpick.png rename to mods/mcl_core/textures/default_tool_diamondpick.png diff --git a/mods/default/textures/default_tool_diamondshovel.png b/mods/mcl_core/textures/default_tool_diamondshovel.png similarity index 100% rename from mods/default/textures/default_tool_diamondshovel.png rename to mods/mcl_core/textures/default_tool_diamondshovel.png diff --git a/mods/default/textures/default_tool_diamondsword.png b/mods/mcl_core/textures/default_tool_diamondsword.png similarity index 100% rename from mods/default/textures/default_tool_diamondsword.png rename to mods/mcl_core/textures/default_tool_diamondsword.png diff --git a/mods/default/textures/default_tool_fishing_pole.png b/mods/mcl_core/textures/default_tool_fishing_pole.png similarity index 100% rename from mods/default/textures/default_tool_fishing_pole.png rename to mods/mcl_core/textures/default_tool_fishing_pole.png diff --git a/mods/default/textures/default_tool_flint_and_steel.png b/mods/mcl_core/textures/default_tool_flint_and_steel.png similarity index 100% rename from mods/default/textures/default_tool_flint_and_steel.png rename to mods/mcl_core/textures/default_tool_flint_and_steel.png diff --git a/mods/default/textures/default_tool_goldaxe.png b/mods/mcl_core/textures/default_tool_goldaxe.png similarity index 100% rename from mods/default/textures/default_tool_goldaxe.png rename to mods/mcl_core/textures/default_tool_goldaxe.png diff --git a/mods/default/textures/default_tool_goldpick.png b/mods/mcl_core/textures/default_tool_goldpick.png similarity index 100% rename from mods/default/textures/default_tool_goldpick.png rename to mods/mcl_core/textures/default_tool_goldpick.png diff --git a/mods/default/textures/default_tool_goldshovel.png b/mods/mcl_core/textures/default_tool_goldshovel.png similarity index 100% rename from mods/default/textures/default_tool_goldshovel.png rename to mods/mcl_core/textures/default_tool_goldshovel.png diff --git a/mods/default/textures/default_tool_goldsword.png b/mods/mcl_core/textures/default_tool_goldsword.png similarity index 100% rename from mods/default/textures/default_tool_goldsword.png rename to mods/mcl_core/textures/default_tool_goldsword.png diff --git a/mods/default/textures/default_tool_shears.png b/mods/mcl_core/textures/default_tool_shears.png similarity index 100% rename from mods/default/textures/default_tool_shears.png rename to mods/mcl_core/textures/default_tool_shears.png diff --git a/mods/default/textures/default_tool_steelaxe.png b/mods/mcl_core/textures/default_tool_steelaxe.png similarity index 100% rename from mods/default/textures/default_tool_steelaxe.png rename to mods/mcl_core/textures/default_tool_steelaxe.png diff --git a/mods/default/textures/default_tool_steelpick.png b/mods/mcl_core/textures/default_tool_steelpick.png similarity index 100% rename from mods/default/textures/default_tool_steelpick.png rename to mods/mcl_core/textures/default_tool_steelpick.png diff --git a/mods/default/textures/default_tool_steelshovel.png b/mods/mcl_core/textures/default_tool_steelshovel.png similarity index 100% rename from mods/default/textures/default_tool_steelshovel.png rename to mods/mcl_core/textures/default_tool_steelshovel.png diff --git a/mods/default/textures/default_tool_steelsword.png b/mods/mcl_core/textures/default_tool_steelsword.png similarity index 100% rename from mods/default/textures/default_tool_steelsword.png rename to mods/mcl_core/textures/default_tool_steelsword.png diff --git a/mods/default/textures/default_tool_stoneaxe.png b/mods/mcl_core/textures/default_tool_stoneaxe.png similarity index 100% rename from mods/default/textures/default_tool_stoneaxe.png rename to mods/mcl_core/textures/default_tool_stoneaxe.png diff --git a/mods/default/textures/default_tool_stonepick.png b/mods/mcl_core/textures/default_tool_stonepick.png similarity index 100% rename from mods/default/textures/default_tool_stonepick.png rename to mods/mcl_core/textures/default_tool_stonepick.png diff --git a/mods/default/textures/default_tool_stoneshovel.png b/mods/mcl_core/textures/default_tool_stoneshovel.png similarity index 100% rename from mods/default/textures/default_tool_stoneshovel.png rename to mods/mcl_core/textures/default_tool_stoneshovel.png diff --git a/mods/default/textures/default_tool_stonesword.png b/mods/mcl_core/textures/default_tool_stonesword.png similarity index 100% rename from mods/default/textures/default_tool_stonesword.png rename to mods/mcl_core/textures/default_tool_stonesword.png diff --git a/mods/default/textures/default_tool_woodaxe.png b/mods/mcl_core/textures/default_tool_woodaxe.png similarity index 100% rename from mods/default/textures/default_tool_woodaxe.png rename to mods/mcl_core/textures/default_tool_woodaxe.png diff --git a/mods/default/textures/default_tool_woodpick.png b/mods/mcl_core/textures/default_tool_woodpick.png similarity index 100% rename from mods/default/textures/default_tool_woodpick.png rename to mods/mcl_core/textures/default_tool_woodpick.png diff --git a/mods/default/textures/default_tool_woodshovel.png b/mods/mcl_core/textures/default_tool_woodshovel.png similarity index 100% rename from mods/default/textures/default_tool_woodshovel.png rename to mods/mcl_core/textures/default_tool_woodshovel.png diff --git a/mods/default/textures/default_tool_woodsword.png b/mods/mcl_core/textures/default_tool_woodsword.png similarity index 100% rename from mods/default/textures/default_tool_woodsword.png rename to mods/mcl_core/textures/default_tool_woodsword.png diff --git a/mods/default/textures/default_torch.png b/mods/mcl_core/textures/default_torch.png similarity index 100% rename from mods/default/textures/default_torch.png rename to mods/mcl_core/textures/default_torch.png diff --git a/mods/default/textures/default_torch_animated.png b/mods/mcl_core/textures/default_torch_animated.png similarity index 100% rename from mods/default/textures/default_torch_animated.png rename to mods/mcl_core/textures/default_torch_animated.png diff --git a/mods/default/textures/default_torch_on_ceiling.png b/mods/mcl_core/textures/default_torch_on_ceiling.png similarity index 100% rename from mods/default/textures/default_torch_on_ceiling.png rename to mods/mcl_core/textures/default_torch_on_ceiling.png diff --git a/mods/default/textures/default_torch_on_ceiling_animated.png b/mods/mcl_core/textures/default_torch_on_ceiling_animated.png similarity index 100% rename from mods/default/textures/default_torch_on_ceiling_animated.png rename to mods/mcl_core/textures/default_torch_on_ceiling_animated.png diff --git a/mods/default/textures/default_torch_on_floor.png b/mods/mcl_core/textures/default_torch_on_floor.png similarity index 100% rename from mods/default/textures/default_torch_on_floor.png rename to mods/mcl_core/textures/default_torch_on_floor.png diff --git a/mods/default/textures/default_torch_on_floor_animated.png b/mods/mcl_core/textures/default_torch_on_floor_animated.png similarity index 100% rename from mods/default/textures/default_torch_on_floor_animated.png rename to mods/mcl_core/textures/default_torch_on_floor_animated.png diff --git a/mods/default/textures/default_tree.png b/mods/mcl_core/textures/default_tree.png similarity index 100% rename from mods/default/textures/default_tree.png rename to mods/mcl_core/textures/default_tree.png diff --git a/mods/default/textures/default_tree_top.png b/mods/mcl_core/textures/default_tree_top.png similarity index 100% rename from mods/default/textures/default_tree_top.png rename to mods/mcl_core/textures/default_tree_top.png diff --git a/mods/default/textures/default_vine.png b/mods/mcl_core/textures/default_vine.png similarity index 100% rename from mods/default/textures/default_vine.png rename to mods/mcl_core/textures/default_vine.png diff --git a/mods/default/textures/default_water.png b/mods/mcl_core/textures/default_water.png similarity index 100% rename from mods/default/textures/default_water.png rename to mods/mcl_core/textures/default_water.png diff --git a/mods/default/textures/default_water_flowing_animated.png b/mods/mcl_core/textures/default_water_flowing_animated.png similarity index 100% rename from mods/default/textures/default_water_flowing_animated.png rename to mods/mcl_core/textures/default_water_flowing_animated.png diff --git a/mods/default/textures/default_water_source_animated.png b/mods/mcl_core/textures/default_water_source_animated.png similarity index 100% rename from mods/default/textures/default_water_source_animated.png rename to mods/mcl_core/textures/default_water_source_animated.png diff --git a/mods/default/textures/default_wood.png b/mods/mcl_core/textures/default_wood.png similarity index 100% rename from mods/default/textures/default_wood.png rename to mods/mcl_core/textures/default_wood.png diff --git a/mods/default/textures/door_wood.png b/mods/mcl_core/textures/door_wood.png similarity index 100% rename from mods/default/textures/door_wood.png rename to mods/mcl_core/textures/door_wood.png diff --git a/mods/default/textures/door_wood_a.png b/mods/mcl_core/textures/door_wood_a.png similarity index 100% rename from mods/default/textures/door_wood_a.png rename to mods/mcl_core/textures/door_wood_a.png diff --git a/mods/default/textures/door_wood_a_r.png b/mods/mcl_core/textures/door_wood_a_r.png similarity index 100% rename from mods/default/textures/door_wood_a_r.png rename to mods/mcl_core/textures/door_wood_a_r.png diff --git a/mods/default/textures/door_wood_b.png b/mods/mcl_core/textures/door_wood_b.png similarity index 100% rename from mods/default/textures/door_wood_b.png rename to mods/mcl_core/textures/door_wood_b.png diff --git a/mods/default/textures/door_wood_b_r.png b/mods/mcl_core/textures/door_wood_b_r.png similarity index 100% rename from mods/default/textures/door_wood_b_r.png rename to mods/mcl_core/textures/door_wood_b_r.png diff --git a/mods/default/textures/fishing_pole.png b/mods/mcl_core/textures/fishing_pole.png similarity index 100% rename from mods/default/textures/fishing_pole.png rename to mods/mcl_core/textures/fishing_pole.png diff --git a/mods/default/textures/heart.png b/mods/mcl_core/textures/heart.png similarity index 100% rename from mods/default/textures/heart.png rename to mods/mcl_core/textures/heart.png diff --git a/mods/default/textures/moon.png b/mods/mcl_core/textures/moon.png similarity index 100% rename from mods/default/textures/moon.png rename to mods/mcl_core/textures/moon.png diff --git a/mods/default/textures/player.png b/mods/mcl_core/textures/player.png similarity index 100% rename from mods/default/textures/player.png rename to mods/mcl_core/textures/player.png diff --git a/mods/default/textures/player_back.png b/mods/mcl_core/textures/player_back.png similarity index 100% rename from mods/default/textures/player_back.png rename to mods/mcl_core/textures/player_back.png diff --git a/mods/default/textures/sun.png b/mods/mcl_core/textures/sun.png similarity index 100% rename from mods/default/textures/sun.png rename to mods/mcl_core/textures/sun.png diff --git a/mods/default/textures/treeprop.png b/mods/mcl_core/textures/treeprop.png similarity index 100% rename from mods/default/textures/treeprop.png rename to mods/mcl_core/textures/treeprop.png diff --git a/mods/default/textures/web.png b/mods/mcl_core/textures/web.png similarity index 100% rename from mods/default/textures/web.png rename to mods/mcl_core/textures/web.png diff --git a/mods/default/textures/wieldhand.png b/mods/mcl_core/textures/wieldhand.png similarity index 100% rename from mods/default/textures/wieldhand.png rename to mods/mcl_core/textures/wieldhand.png diff --git a/mods/default/tools.lua b/mods/mcl_core/tools.lua similarity index 85% rename from mods/default/tools.lua rename to mods/mcl_core/tools.lua index 295a525c48..9c4a4e8009 100644 --- a/mods/default/tools.lua +++ b/mods/mcl_core/tools.lua @@ -34,7 +34,7 @@ minetest.register_item(":", { }) -- Picks -minetest.register_tool("default:pick_wood", { +minetest.register_tool("mcl_core:pick_wood", { description = "Wooden Pickaxe", inventory_image = "default_tool_woodpick.png", groups = { tool=1 }, @@ -48,7 +48,7 @@ minetest.register_tool("default:pick_wood", { damage_groups = {fleshy=2}, }, }) -minetest.register_tool("default:pick_stone", { +minetest.register_tool("mcl_core:pick_stone", { description = "Stone Pickaxe", inventory_image = "default_tool_stonepick.png", groups = { tool=1 }, @@ -62,7 +62,7 @@ minetest.register_tool("default:pick_stone", { damage_groups = {fleshy=3}, }, }) -minetest.register_tool("default:pick_steel", { +minetest.register_tool("mcl_core:pick_steel", { description = "Iron Pickaxe", inventory_image = "default_tool_steelpick.png", groups = { tool=1 }, @@ -76,7 +76,7 @@ minetest.register_tool("default:pick_steel", { damage_groups = {fleshy=4}, }, }) -minetest.register_tool("default:pick_gold", { +minetest.register_tool("mcl_core:pick_gold", { description = "Golden Pickaxe", inventory_image = "default_tool_goldpick.png", groups = { tool=1 }, @@ -90,7 +90,7 @@ minetest.register_tool("default:pick_gold", { damage_groups = {fleshy=2}, }, }) -minetest.register_tool("default:pick_diamond", { +minetest.register_tool("mcl_core:pick_diamond", { description = "Diamond Pickaxe", inventory_image = "default_tool_diamondpick.png", groups = { tool=1 }, @@ -106,7 +106,7 @@ minetest.register_tool("default:pick_diamond", { }) -- Shovels -minetest.register_tool("default:shovel_wood", { +minetest.register_tool("mcl_core:shovel_wood", { description = "Wooden Shovel", inventory_image = "default_tool_woodshovel.png", wield_image = "default_tool_woodshovel.png^[transformR90", @@ -120,7 +120,7 @@ minetest.register_tool("default:shovel_wood", { damage_groups = {fleshy=2}, }, }) -minetest.register_tool("default:shovel_stone", { +minetest.register_tool("mcl_core:shovel_stone", { description = "Stone Shovel", inventory_image = "default_tool_stoneshovel.png", wield_image = "default_tool_stoneshovel.png^[transformR90", @@ -134,7 +134,7 @@ minetest.register_tool("default:shovel_stone", { damage_groups = {fleshy=3}, }, }) -minetest.register_tool("default:shovel_steel", { +minetest.register_tool("mcl_core:shovel_steel", { description = "Iron Shovel", inventory_image = "default_tool_steelshovel.png", wield_image = "default_tool_steelshovel.png^[transformR90", @@ -148,7 +148,7 @@ minetest.register_tool("default:shovel_steel", { damage_groups = {fleshy=4}, }, }) -minetest.register_tool("default:shovel_gold", { +minetest.register_tool("mcl_core:shovel_gold", { description = "Golden Shovel", inventory_image = "default_tool_goldshovel.png", wield_image = "default_tool_goldshovel.png^[transformR90", @@ -162,7 +162,7 @@ minetest.register_tool("default:shovel_gold", { damage_groups = {fleshy=2}, }, }) -minetest.register_tool("default:shovel_diamond", { +minetest.register_tool("mcl_core:shovel_diamond", { description = "Diamond Shovel", inventory_image = "default_tool_diamondshovel.png", wield_image = "default_tool_diamondshovel.png^[transformR90", @@ -178,7 +178,7 @@ minetest.register_tool("default:shovel_diamond", { }) -- Axes -minetest.register_tool("default:axe_wood", { +minetest.register_tool("mcl_core:axe_wood", { description = "Wooden Axe", inventory_image = "default_tool_woodaxe.png", groups = { tool=1 }, @@ -191,7 +191,7 @@ minetest.register_tool("default:axe_wood", { damage_groups = {fleshy=7}, }, }) -minetest.register_tool("default:axe_stone", { +minetest.register_tool("mcl_core:axe_stone", { description = "Stone Axe", inventory_image = "default_tool_stoneaxe.png", groups = { tool=1 }, @@ -204,7 +204,7 @@ minetest.register_tool("default:axe_stone", { damage_groups = {fleshy=9}, }, }) -minetest.register_tool("default:axe_steel", { +minetest.register_tool("mcl_core:axe_steel", { description = "Iron Axe", inventory_image = "default_tool_steelaxe.png", groups = { tool=1 }, @@ -218,7 +218,7 @@ minetest.register_tool("default:axe_steel", { damage_groups = {fleshy=9}, }, }) -minetest.register_tool("default:axe_gold", { +minetest.register_tool("mcl_core:axe_gold", { description = "Golden Axe", inventory_image = "default_tool_goldaxe.png", groups = { tool=1 }, @@ -231,7 +231,7 @@ minetest.register_tool("default:axe_gold", { damage_groups = {fleshy=7}, }, }) -minetest.register_tool("default:axe_diamond", { +minetest.register_tool("mcl_core:axe_diamond", { description = "Diamond Axe", inventory_image = "default_tool_diamondaxe.png", groups = { tool=1 }, @@ -246,7 +246,7 @@ minetest.register_tool("default:axe_diamond", { }) -- Swords -minetest.register_tool("default:sword_wood", { +minetest.register_tool("mcl_core:sword_wood", { description = "Wooden Sword", inventory_image = "default_tool_woodsword.png", groups = { weapon=1 }, @@ -259,7 +259,7 @@ minetest.register_tool("default:sword_wood", { damage_groups = {fleshy=4}, } }) -minetest.register_tool("default:sword_stone", { +minetest.register_tool("mcl_core:sword_stone", { description = "Stone Sword", inventory_image = "default_tool_stonesword.png", groups = { weapon=1 }, @@ -272,7 +272,7 @@ minetest.register_tool("default:sword_stone", { damage_groups = {fleshy=5}, } }) -minetest.register_tool("default:sword_steel", { +minetest.register_tool("mcl_core:sword_steel", { description = "Iron Sword", inventory_image = "default_tool_steelsword.png", groups = { weapon=1 }, @@ -285,7 +285,7 @@ minetest.register_tool("default:sword_steel", { damage_groups = {fleshy=6}, } }) -minetest.register_tool("default:sword_gold", { +minetest.register_tool("mcl_core:sword_gold", { description = "Golden Sword", inventory_image = "default_tool_goldsword.png", groups = { weapon=1 }, @@ -298,7 +298,7 @@ minetest.register_tool("default:sword_gold", { damage_groups = {fleshy=4}, } }) -minetest.register_tool("default:sword_diamond", { +minetest.register_tool("mcl_core:sword_diamond", { description = "Diamond Sword", inventory_image = "default_tool_diamondsword.png", groups = { weapon=1 }, @@ -313,7 +313,7 @@ minetest.register_tool("default:sword_diamond", { }) -- Flint and Steel -minetest.register_tool("default:flint_and_steel", { +minetest.register_tool("mcl_core:flint_and_steel", { description = "Flint and Steel", inventory_image = "default_tool_flint_and_steel.png", liquids_pointable = false, @@ -331,7 +331,7 @@ minetest.register_tool("default:flint_and_steel", { if minetest.get_node(pointed_thing.under).name == "mcl_tnt:tnt" then tnt.ignite(pointed_thing.under) else - default.set_fire(pointed_thing) + mcl_core.set_fire(pointed_thing) itemstack:add_wear(66000/65) -- 65 uses return itemstack end @@ -340,7 +340,7 @@ minetest.register_tool("default:flint_and_steel", { }) -- Fishing Pole -minetest.register_tool("default:pole", { +minetest.register_tool("mcl_core:pole", { description = "Fishing Rod", groups = { tool=1 }, inventory_image = "default_tool_fishing_pole.png", @@ -349,7 +349,7 @@ minetest.register_tool("default:pole", { on_use = function (itemstack, user, pointed_thing) if pointed_thing and pointed_thing.under then local node = minetest.get_node(pointed_thing.under) - if string.find(node.name, "default:water") then + if string.find(node.name, "mcl_core:water") then local itemname local itemcount = 1 local r = math.random(1, 100) @@ -357,25 +357,25 @@ minetest.register_tool("default:pole", { -- Fish r = math.random(1, 100) if r <= 60 then - itemname = "default:fish" + itemname = "mcl_core:fish" elseif r <= 85 then - itemname = "default:fish" - --itemname = "default:salmon" + itemname = "mcl_core:fish" + --itemname = "mcl_core:salmon" elseif r <= 87 then - itemname = "default:fish" - --itemname = "default:clownfish" + itemname = "mcl_core:fish" + --itemname = "mcl_core:clownfish" else - itemname = "default:fish" - --itemname = "default:pufferfish" + itemname = "mcl_core:fish" + --itemname = "mcl_core:pufferfish" end elseif r <= 95 then -- Junk r = math.random(1, 83) if r <= 10 then - itemname = "default:bowl" + itemname = "mcl_core:bowl" elseif r <= 12 then -- TODO: Damaged - itemname = "default:pole" + itemname = "mcl_core:pole" elseif r <= 22 then itemname = "mcl_mobitems:leather" elseif r <= 32 then @@ -383,20 +383,20 @@ minetest.register_tool("default:pole", { elseif r <= 42 then itemname = "mcl_mobitems:rotten_flesh" elseif r <= 47 then - itemname = "default:stick" + itemname = "mcl_core:stick" elseif r <= 52 then - itemname = "default:string" + itemname = "mcl_core:string" elseif r <= 62 then itemname = "mcl_potions:glass_bottle" --TODO itemname = "mcl_potions:bottle_water" elseif r <= 72 then - itemname = "default:bone" + itemname = "mcl_core:bone" elseif r <= 73 then itemname = "mcl_dye:black" itemcount = 10 else -- TODO: Tripwire hook - itemname = "default:string" + itemname = "mcl_core:string" end else -- Treasure @@ -406,10 +406,10 @@ minetest.register_tool("default:pole", { itemname = "throwing:bow" elseif r == 2 then -- TODO: Enchanted book - itemname = "default:book" + itemname = "mcl_core:book" elseif r == 3 then -- TODO: Enchanted and damaged - itemname = "default:pole" + itemname = "mcl_core:pole" elseif r == 4 then itemname = "mobs:naming_tag" elseif r == 5 then @@ -431,7 +431,7 @@ minetest.register_tool("default:pole", { }) --Shears -minetest.register_tool("default:shears", { +minetest.register_tool("mcl_core:shears", { description = "Shears", inventory_image = "default_tool_shears.png", wield_image = "default_tool_shears.png", diff --git a/mods/mcl_dye/depends.txt b/mods/mcl_dye/depends.txt index 2a7ff06401..5b71cc42b6 100644 --- a/mods/mcl_dye/depends.txt +++ b/mods/mcl_dye/depends.txt @@ -1 +1,2 @@ +mcl_core mcl_flowers diff --git a/mods/mcl_dye/init.lua b/mods/mcl_dye/init.lua index 0767268f98..1e265b67c5 100644 --- a/mods/mcl_dye/init.lua +++ b/mods/mcl_dye/init.lua @@ -102,7 +102,7 @@ minetest.register_craftitem("mcl_dye:white", { stack_max = 64, groups = {dye=1, craftitem=1, basecolor_white=1, excolor_white=1, unicolor_white=1}, on_place = function(itemstack, user, pointed_thing) - if(default.duengen(pointed_thing)) then + if(mcl_core.duengen(pointed_thing)) then itemstack:take_item() end return itemstack @@ -177,7 +177,7 @@ minetest.register_craft({ -- Dye creation minetest.register_craft({ output = "mcl_dye:yellow", - recipe = {{"mcl_flowers:dandelion_yellow"}}, + recipe = {{"mcl_flowers:dandelion"}}, }) minetest.register_craft({ output = "mcl_dye:yellow 2", @@ -234,10 +234,10 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", output = "mcl_dye:dark_green", - recipe = "default:cactus", + recipe = "mcl_core:cactus", cooktime = 10, }) minetest.register_craft({ output = "mcl_dye:white 3", - recipe = {{"default:bone"}}, + recipe = {{"mcl_core:bone"}}, }) diff --git a/mods/mcl_end/depends.txt b/mods/mcl_end/depends.txt index ae4cd08169..e0f1bd69d9 100644 --- a/mods/mcl_end/depends.txt +++ b/mods/mcl_end/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core mcl_throwing diff --git a/mods/mcl_end/init.lua b/mods/mcl_end/init.lua index a70bb9c257..3baa51f567 100644 --- a/mods/mcl_end/init.lua +++ b/mods/mcl_end/init.lua @@ -4,7 +4,7 @@ minetest.register_node("mcl_end:end_stone", { tiles = {"mcl_end_end_stone.png"}, stack_max = 64, groups = {cracky=2,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) minetest.register_node("mcl_end:end_bricks", { @@ -13,7 +13,7 @@ minetest.register_node("mcl_end:end_bricks", { is_ground_content = false, stack_max = 64, groups = {cracky=3,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) minetest.register_node("mcl_end:purpur_block", { @@ -22,7 +22,7 @@ minetest.register_node("mcl_end:purpur_block", { is_ground_content = false, stack_max = 64, groups = {cracky=3,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) minetest.register_node("mcl_end:purpur_pillar", { @@ -32,7 +32,7 @@ minetest.register_node("mcl_end:purpur_pillar", { is_ground_content = false, tiles = {"mcl_end_purpur_pillar_top.png", "mcl_end_purpur_pillar_top.png", "mcl_end_purpur_pillar.png"}, groups = {cracky=3,building_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) local rod_box = { @@ -68,7 +68,7 @@ minetest.register_node("mcl_end:end_rod", { selection_box = rod_box, -- FIXME: Collision box does not seem to rotate correctly collision_box = rod_box, - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), }) minetest.register_node("mcl_end:dragon_egg", { @@ -103,7 +103,7 @@ minetest.register_node("mcl_end:dragon_egg", { type = "regular", }, groups = { oddly_breakable_by_hand = 3, falling_node = 1, deco_block = 1, not_in_creative_inventory = 1 }, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), -- TODO: Make dragon egg teleport on punching }) diff --git a/mods/mcl_farming/carrots.lua b/mods/mcl_farming/carrots.lua index 9112535bf2..5aadb9f6f3 100644 --- a/mods/mcl_farming/carrots.lua +++ b/mods/mcl_farming/carrots.lua @@ -11,7 +11,7 @@ minetest.register_node("mcl_farming:carrot_1", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:carrot_2", { @@ -27,7 +27,7 @@ minetest.register_node("mcl_farming:carrot_2", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:carrot_3", { @@ -43,7 +43,7 @@ minetest.register_node("mcl_farming:carrot_3", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:carrot", { @@ -61,7 +61,7 @@ minetest.register_node("mcl_farming:carrot", { } }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_farming:carrot_item", { @@ -84,9 +84,9 @@ minetest.register_craftitem("mcl_farming:carrot_item_gold", { minetest.register_craft({ output = "mcl_farming:carrot_item_gold", recipe = { - {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, - {'default:gold_nugget', 'mcl_farming:carrot_item', 'default:gold_nugget'}, - {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, + {'mcl_core:gold_nugget', 'mcl_core:gold_nugget', 'mcl_core:gold_nugget'}, + {'mcl_core:gold_nugget', 'mcl_farming:carrot_item', 'mcl_core:gold_nugget'}, + {'mcl_core:gold_nugget', 'mcl_core:gold_nugget', 'mcl_core:gold_nugget'}, } }) diff --git a/mods/mcl_farming/depends.txt b/mods/mcl_farming/depends.txt index 907f9a5c86..9e1c117212 100644 --- a/mods/mcl_farming/depends.txt +++ b/mods/mcl_farming/depends.txt @@ -1,3 +1,4 @@ -default +mcl_core bucket mcl_wool +torches diff --git a/mods/mcl_farming/hoes.lua b/mods/mcl_farming/hoes.lua index 67df5871d9..99b8eed742 100644 --- a/mods/mcl_farming/hoes.lua +++ b/mods/mcl_farming/hoes.lua @@ -13,7 +13,7 @@ local function create_soil(pos, inv) end elseif minetest.get_item_group(name, "cultivatable") == 1 then if above.name == "air" then - node.name = "default:dirt" + node.name = "mcl_core:dirt" minetest.set_node(pos, node) return true end @@ -43,16 +43,16 @@ minetest.register_craft({ output = "mcl_farming:hoe_wood", recipe = { {"group:wood", "group:wood"}, - {"", "default:stick"}, - {"", "default:stick"} + {"", "mcl_core:stick"}, + {"", "mcl_core:stick"} } }) minetest.register_craft({ output = "mcl_farming:hoe_wood", recipe = { {"group:wood", "group:wood"}, - {"default:stick", ""}, - {"default:stick", ""} + {"mcl_core:stick", ""}, + {"mcl_core:stick", ""} } }) minetest.register_craft({ @@ -82,17 +82,17 @@ minetest.register_tool("mcl_farming:hoe_stone", { minetest.register_craft({ output = "mcl_farming:hoe_stone", recipe = { - {"default:cobble", "default:cobble"}, - {"", "default:stick"}, - {"", "default:stick"} + {"mcl_core:cobble", "mcl_core:cobble"}, + {"", "mcl_core:stick"}, + {"", "mcl_core:stick"} } }) minetest.register_craft({ output = "mcl_farming:hoe_stone", recipe = { - {"default:cobble", "default:cobble"}, - {"default:stick", ""}, - {"default:stick", ""} + {"mcl_core:cobble", "mcl_core:cobble"}, + {"mcl_core:stick", ""}, + {"mcl_core:stick", ""} } }) @@ -118,23 +118,23 @@ minetest.register_tool("mcl_farming:hoe_steel", { minetest.register_craft({ output = "mcl_farming:hoe_steel", recipe = { - {"default:steel_ingot", "default:steel_ingot"}, - {"", "default:stick"}, - {"", "default:stick"} + {"mcl_core:steel_ingot", "mcl_core:steel_ingot"}, + {"", "mcl_core:stick"}, + {"", "mcl_core:stick"} } }) minetest.register_craft({ output = "mcl_farming:hoe_steel", recipe = { - {"default:steel_ingot", "default:steel_ingot"}, - {"default:stick", ""}, - {"default:stick", ""} + {"mcl_core:steel_ingot", "mcl_core:steel_ingot"}, + {"mcl_core:stick", ""}, + {"mcl_core:stick", ""} } }) minetest.register_craft({ type = "cooking", - output = "default:iron_nugget", + output = "mcl_core:iron_nugget", recipe = "mcl_farming:hoe_steel", cooktime = 10, }) @@ -160,17 +160,17 @@ minetest.register_tool("mcl_farming:hoe_gold", { minetest.register_craft({ output = "mcl_farming:hoe_gold", recipe = { - {"default:gold_ingot", "default:gold_ingot"}, - {"", "default:stick"}, - {"", "default:stick"} + {"mcl_core:gold_ingot", "mcl_core:gold_ingot"}, + {"", "mcl_core:stick"}, + {"", "mcl_core:stick"} } }) minetest.register_craft({ output = "mcl_farming:hoe_gold", recipe = { - {"default:gold_ingot", "default:gold_ingot"}, - {"default:stick", ""}, - {"default:stick", ""} + {"mcl_core:gold_ingot", "mcl_core:gold_ingot"}, + {"mcl_core:stick", ""}, + {"mcl_core:stick", ""} } }) @@ -178,7 +178,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", - output = "default:gold_nugget", + output = "mcl_core:gold_nugget", recipe = "mcl_farming:hoe_gold", cooktime = 10, }) @@ -204,16 +204,16 @@ minetest.register_tool("mcl_farming:hoe_diamond", { minetest.register_craft({ output = "mcl_farming:hoe_diamond", recipe = { - {"default:diamond", "default:diamond"}, - {"", "default:stick"}, - {"", "default:stick"} + {"mcl_core:diamond", "mcl_core:diamond"}, + {"", "mcl_core:stick"}, + {"", "mcl_core:stick"} } }) minetest.register_craft({ output = "mcl_farming:hoe_diamond", recipe = { - {"default:diamond", "default:diamond"}, - {"default:stick", ""}, - {"default:stick", ""} + {"mcl_core:diamond", "mcl_core:diamond"}, + {"mcl_core:stick", ""}, + {"mcl_core:stick", ""} } }) diff --git a/mods/mcl_farming/melon.lua b/mods/mcl_farming/melon.lua index 7dba9c7d90..b72f4149cb 100644 --- a/mods/mcl_farming/melon.lua +++ b/mods/mcl_farming/melon.lua @@ -51,7 +51,7 @@ minetest.register_node("mcl_farming:melontige_1", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_2", { @@ -68,7 +68,7 @@ minetest.register_node("mcl_farming:melontige_2", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_unconnect", { @@ -79,7 +79,7 @@ minetest.register_node("mcl_farming:melontige_unconnect", { drawtype = "plantlike", tiles = {"farming_tige_end.png"}, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_r", { @@ -109,7 +109,7 @@ minetest.register_node("mcl_farming:melontige_linked_r", { "farming_tige_connnect.png^[transformFX90" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_l", { @@ -139,7 +139,7 @@ minetest.register_node("mcl_farming:melontige_linked_l", { "farming_tige_connnect.png" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_t", { @@ -169,7 +169,7 @@ minetest.register_node("mcl_farming:melontige_linked_t", { "farming_tige_connnect.png" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:melontige_linked_b", { @@ -199,7 +199,7 @@ minetest.register_node("mcl_farming:melontige_linked_b", { "farming_tige_connnect.png" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_farming:melon_seed", { @@ -235,8 +235,8 @@ minetest.register_abm({ newpos = {x=pos.x+x, y=pos.y, z=pos.z} local n = minetest.get_node(p) local nod = minetest.get_node(newpos) - if n.name=="default:dirt_with_grass" and nod.name=="air" and have_change == 0 - or n.name=="default:dirt" and nod.name=="air" and have_change == 0 + if n.name=="mcl_core:dirt_with_grass" and nod.name=="air" and have_change == 0 + or n.name=="mcl_core:dirt" and nod.name=="air" and have_change == 0 or string.find(n.name, "mcl_farming:soil") and nod.name=="air" and have_change == 0 then have_change = 1 minetest.add_node(newpos, {name="mcl_farming:melon"}) @@ -253,8 +253,8 @@ minetest.register_abm({ newpos = {x=pos.x, y=pos.y, z=pos.z+z} local n = minetest.get_node(p) local nod2 = minetest.get_node(newpos) - if n.name=="default:dirt_with_grass" and nod2.name=="air" and have_change == 0 - or n.name=="default:dirt" and nod2.name=="air" and have_change == 0 + if n.name=="mcl_core:dirt_with_grass" and nod2.name=="air" and have_change == 0 + or n.name=="mcl_core:dirt" and nod2.name=="air" and have_change == 0 or string.find(n.name, "mcl_farming:soil") and nod2.name=="air" and have_change == 0 then have_change = 1 minetest.add_node(newpos, {name="mcl_farming:melon"}) diff --git a/mods/mcl_farming/mushrooms.lua b/mods/mcl_farming/mushrooms.lua index a6d59338a2..27fa524fc0 100644 --- a/mods/mcl_farming/mushrooms.lua +++ b/mods/mcl_farming/mushrooms.lua @@ -8,7 +8,7 @@ minetest.register_node("mcl_farming:mushroom_brown", { paramtype = "light", walkable = false, groups = {dig_immediate=3,flammable=2,mushroom=1,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), light_source = 1, selection_box = { type = "fixed", @@ -26,7 +26,7 @@ minetest.register_node("mcl_farming:mushroom_red", { paramtype = "light", walkable = false, groups = {dig_immediate=3,flammable=2,mushroom=1,attached_node=1,dig_by_water=1,deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.015, 0.15 }, @@ -36,7 +36,7 @@ minetest.register_node("mcl_farming:mushroom_red", { minetest.register_craftitem("mcl_farming:mushroom_stew", { description = "Mushroom Stew", inventory_image = "farming_mushroom_stew.png", - on_use = minetest.item_eat(6, "default:bowl"), + on_use = minetest.item_eat(6, "mcl_core:bowl"), groups = { food = 2, eatable = 6 }, stack_max = 1, }) @@ -44,5 +44,5 @@ minetest.register_craftitem("mcl_farming:mushroom_stew", { minetest.register_craft({ type = "shapeless", output = "mcl_farming:mushroom_stew", - recipe = {'default:bowl', 'mcl_farming:mushroom_brown', 'mcl_farming:mushroom_red'} + recipe = {'mcl_core:bowl', 'mcl_farming:mushroom_brown', 'mcl_farming:mushroom_red'} }) diff --git a/mods/mcl_farming/potatoes.lua b/mods/mcl_farming/potatoes.lua index 9ed1b75226..49854ca093 100644 --- a/mods/mcl_farming/potatoes.lua +++ b/mods/mcl_farming/potatoes.lua @@ -11,7 +11,7 @@ minetest.register_node("mcl_farming:potato_1", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:potato_2", { @@ -27,7 +27,7 @@ minetest.register_node("mcl_farming:potato_2", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:potato", { @@ -44,7 +44,7 @@ minetest.register_node("mcl_farming:potato", { } }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_craftitem("mcl_farming:potato_item", { diff --git a/mods/mcl_farming/pumpkin.lua b/mods/mcl_farming/pumpkin.lua index f4b3c92065..38892cb47c 100644 --- a/mods/mcl_farming/pumpkin.lua +++ b/mods/mcl_farming/pumpkin.lua @@ -28,7 +28,7 @@ minetest.register_node("mcl_farming:pumpkin_1", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkin_2", { @@ -45,7 +45,7 @@ minetest.register_node("mcl_farming:pumpkin_2", { }, }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) @@ -76,7 +76,7 @@ minetest.register_node("mcl_farming:pumpkin_face", { end end end, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_unconnect", { @@ -87,7 +87,7 @@ minetest.register_node("mcl_farming:pumpkintige_unconnect", { drawtype = "plantlike", tiles = {"farming_tige_end.png"}, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) @@ -118,7 +118,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_r", { "farming_tige_connnect.png^[transformFX90" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_linked_l", { @@ -148,7 +148,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_l", { "farming_tige_connnect.png" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_linked_t", { @@ -178,7 +178,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_t", { "farming_tige_connnect.png" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) minetest.register_node("mcl_farming:pumpkintige_linked_b", { @@ -208,7 +208,7 @@ minetest.register_node("mcl_farming:pumpkintige_linked_b", { "farming_tige_connnect.png" --front }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1 ,dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), }) mcl_farming:add_plant("mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2"}, 80, 20) @@ -229,8 +229,8 @@ minetest.register_abm({ newpos = {x=pos.x+x, y=pos.y, z=pos.z} local n = minetest.get_node(p) local nod = minetest.get_node(newpos) - if n.name=="default:dirt_with_grass" and nod.name=="air" and have_change == 0 - or n.name=="default:dirt" and nod.name=="air" and have_change == 0 + if n.name=="mcl_core:dirt_with_grass" and nod.name=="air" and have_change == 0 + or n.name=="mcl_core:dirt" and nod.name=="air" and have_change == 0 or string.find(n.name, "mcl_farming:soil") and nod.name=="air" and have_change == 0 then have_change = 1 minetest.add_node(newpos, {name="mcl_farming:pumpkin_face"}) @@ -247,8 +247,8 @@ minetest.register_abm({ newpos = {x=pos.x, y=pos.y, z=pos.z+z} local n = minetest.get_node(p) local nod2 = minetest.get_node(newpos) - if n.name=="default:dirt_with_grass" and nod2.name=="air" and have_change == 0 - or n.name=="default:dirt" and nod2.name=="air" and have_change == 0 + if n.name=="mcl_core:dirt_with_grass" and nod2.name=="air" and have_change == 0 + or n.name=="mcl_core:dirt" and nod2.name=="air" and have_change == 0 or string.find(n.name, "mcl_farming:soil") and nod2.name=="air" and have_change == 0 then have_change = 1 minetest.add_node(newpos, {name="mcl_farming:pumpkin_face"}) @@ -273,13 +273,13 @@ minetest.register_node("mcl_farming:pumpkin_face_light", { light_source = 14, tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face_light.png"}, groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2, building_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_craft({ output = "mcl_farming:pumpkin_face_light", recipe = {{"mcl_farming:pumpkin_face"}, - {"default:torch"}} + {"torches:torch"}} }) minetest.register_craft({ diff --git a/mods/mcl_farming/soil.lua b/mods/mcl_farming/soil.lua index e1f5a5260f..1e1377b5b5 100644 --- a/mods/mcl_farming/soil.lua +++ b/mods/mcl_farming/soil.lua @@ -1,7 +1,7 @@ minetest.register_node("mcl_farming:soil", { tiles = {"farming_soil.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png"}, description = "Farmland", - drop = "default:dirt", + drop = "mcl_core:dirt", drawtype = "nodebox", paramtype = "light", node_box = { @@ -12,13 +12,13 @@ minetest.register_node("mcl_farming:soil", { } }, groups = { crumbly=3, not_in_creative_inventory=1, soil=2, soil_sapling=1 }, - sounds = default.node_sound_dirt_defaults(), + sounds = mcl_core.node_sound_dirt_defaults(), }) minetest.register_node("mcl_farming:soil_wet", { tiles = {"farming_soil_wet.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png"}, description = "Hydrated Farmland", - drop = "default:dirt", + drop = "mcl_core:dirt", drawtype = "nodebox", paramtype = "light", node_box = { @@ -28,7 +28,7 @@ minetest.register_node("mcl_farming:soil_wet", { } }, groups = { crumbly=3, not_in_creative_inventory=1, soil=3, soil_sapling=1 }, - sounds = default.node_sound_dirt_defaults(), + sounds = mcl_core.node_sound_dirt_defaults(), }) minetest.register_abm({ @@ -36,7 +36,7 @@ minetest.register_abm({ interval = 15, chance = 3, action = function(pos, node) - if minetest.find_node_near(pos, 3, {"default:water_source", "default:water_flowing"}) then + if minetest.find_node_near(pos, 3, {"mcl_core:water_source", "mcl_core:water_flowing"}) then node.name = "mcl_farming:soil_wet" minetest.set_node(pos, node) end diff --git a/mods/mcl_farming/wheat.lua b/mods/mcl_farming/wheat.lua index 232f3c48aa..218137b7ed 100644 --- a/mods/mcl_farming/wheat.lua +++ b/mods/mcl_farming/wheat.lua @@ -22,7 +22,7 @@ minetest.register_node("mcl_farming:wheat_1", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { @@ -49,7 +49,7 @@ minetest.register_node("mcl_farming:wheat_2", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { @@ -76,7 +76,7 @@ minetest.register_node("mcl_farming:wheat_3", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { @@ -111,7 +111,7 @@ minetest.register_node("mcl_farming:wheat", { }, }, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_by_water=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), node_box = { type = "fixed", fixed = { diff --git a/mods/mcl_fences/depends.txt b/mods/mcl_fences/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_fences/depends.txt +++ b/mods/mcl_fences/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_fences/init.lua b/mods/mcl_fences/init.lua index ed3f3e418e..29c1ed1400 100644 --- a/mods/mcl_fences/init.lua +++ b/mods/mcl_fences/init.lua @@ -186,15 +186,15 @@ end local wood_groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,fence_wood=1} local wood_connect = {} -local wood_sounds = default.node_sound_wood_defaults() +local wood_sounds = mcl_core.node_sound_wood_defaults() local woods = { - {"", "Oak Fence", "Oak Fence Gate", "default_wood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:wood"}, - {"spruce", "Spruce Fence", "Spruce Fence Gate", "default_sprucewood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:sprucewood"}, - {"birch", "Birch Fence", "Birch Fence Gate", "default_planks_birch.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:birchwood"}, - {"jungle", "Jungle Fence", "Jungle Fence Gate", "default_junglewood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:junglewood"}, - {"dark_oak", "Dark Oak Fence", "Dark Oak Fence Gate", "default_planks_big_oak.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:darkwood"}, - {"acacia", "Acacia Fence", "Acacia Fence Gate", "default_acaciawood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:acaciawood"}, + {"", "Oak Fence", "Oak Fence Gate", "default_wood.png", "default_fence.png", "mcl_fences_fence_gate.png", "mcl_core:wood"}, + {"spruce", "Spruce Fence", "Spruce Fence Gate", "default_sprucewood.png", "default_fence.png", "mcl_fences_fence_gate.png", "mcl_core:sprucewood"}, + {"birch", "Birch Fence", "Birch Fence Gate", "default_planks_birch.png", "default_fence.png", "mcl_fences_fence_gate.png", "mcl_core:birchwood"}, + {"jungle", "Jungle Fence", "Jungle Fence Gate", "default_junglewood.png", "default_fence.png", "mcl_fences_fence_gate.png", "mcl_core:junglewood"}, + {"dark_oak", "Dark Oak Fence", "Dark Oak Fence Gate", "default_planks_big_oak.png", "default_fence.png", "mcl_fences_fence_gate.png", "mcl_core:darkwood"}, + {"acacia", "Acacia Fence", "Acacia Fence Gate", "default_acaciawood.png", "default_fence.png", "mcl_fences_fence_gate.png", "mcl_core:acaciawood"}, } for w=1, #woods do @@ -212,15 +212,15 @@ for w=1, #woods do minetest.register_craft({ output = 'mcl_fences:'..id..' 3', recipe = { - {wood[7], 'default:stick', wood[7]}, - {wood[7], 'default:stick', wood[7]}, + {wood[7], 'mcl_core:stick', wood[7]}, + {wood[7], 'mcl_core:stick', wood[7]}, } }) minetest.register_craft({ output = 'mcl_fences:'..id_gate, recipe = { - {'default:stick', wood[7], 'default:stick'}, - {'default:stick', wood[7], 'default:stick'}, + {'mcl_core:stick', wood[7], 'mcl_core:stick'}, + {'mcl_core:stick', wood[7], 'mcl_core:stick'}, } }) end diff --git a/mods/mcl_flowers/depends.txt b/mods/mcl_flowers/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_flowers/depends.txt +++ b/mods/mcl_flowers/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_flowers/init.lua b/mods/mcl_flowers/init.lua index 447dd742ec..ff18fae553 100644 --- a/mods/mcl_flowers/init.lua +++ b/mods/mcl_flowers/init.lua @@ -16,7 +16,7 @@ dofile(minetest.get_modpath("mcl_flowers").."/func.lua") local function add_simple_flower(name, desc, image, color) - minetest.register_node("mcl_flowers:"..name.."", { + minetest.register_node("mcl_flowers:"..name, { description = desc, drawtype = "plantlike", tiles = { image..".png" }, @@ -27,7 +27,7 @@ local function add_simple_flower(name, desc, image, color) walkable = false, stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,dig_by_water=1,color=1,deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), buildable_to = true, selection_box = { type = "fixed", @@ -53,7 +53,7 @@ minetest.register_node("mcl_flowers:tulip_pink", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_pink=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -72,7 +72,7 @@ minetest.register_node("mcl_flowers:tulip_red", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_red=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -92,7 +92,7 @@ minetest.register_node("mcl_flowers:tulip_white", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_white=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -114,7 +114,7 @@ minetest.register_node("mcl_flowers:allium", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_pink=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -135,7 +135,7 @@ minetest.register_node("mcl_flowers:peony", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_pink=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -157,7 +157,7 @@ minetest.register_node("mcl_flowers:azure_bluet", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_white=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -178,7 +178,7 @@ minetest.register_node("mcl_flowers:blue_orchid", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,color_blue=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -199,7 +199,7 @@ minetest.register_node("mcl_flowers:fern", { stack_max = 64, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,dig_by_water=1,deco_block=1}, buildable_to = true, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.15, -0.5, -0.15, 0.15, 0.2, 0.15 }, @@ -247,7 +247,7 @@ function register_large(name, desc, inv_img, bot_img, colr) --change in function ]] drop = "mcl_flowers:"..name, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,colr=1, dig_by_water=1, double_bottom =1,deco_block=1,deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.25, -0.5, -0.25, 0.25, 0.5, 0.25 }, @@ -267,7 +267,7 @@ function register_large(name, desc, inv_img, bot_img, colr) --change in function buildable_to = true, drop = "mcl_flowers:"..name, groups = {dig_immediate=3,flammable=2,flower=1,attached_node=1,colr=1, dig_by_water=1, not_in_creative_inventory = 1, double_top =1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), selection_box = { type = "fixed", fixed = { -0.25, -0.5, -0.25, 0.25, 0.5, 0.25 }, @@ -297,7 +297,7 @@ minetest.register_node("mcl_flowers:pot",{ paramtype = "light", groups = {dig_immediate=3,deco_block=1}, stack_max = 64, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) @@ -344,7 +344,7 @@ minetest.register_node("mcl_flowers:waterlily", { walkable = true, sunlight_propagates = true, groups = {dig_immediate = 3, dig_by_water = 1, deco_block=1}, - sounds = default.node_sound_leaves_defaults(), + sounds = mcl_core.node_sound_leaves_defaults(), node_placement_prediction = "", node_box = { type = "fixed", @@ -367,7 +367,7 @@ minetest.register_node("mcl_flowers:waterlily", { pointed_thing.under.x == pointed_thing.above.x and pointed_thing.under.z == pointed_thing.above.z then if ((def.liquidtype == "source" and minetest.get_item_group(node, "water") > 0) or - (node == "default:ice") or + (node == "mcl_core:ice") or (minetest.get_item_group(node, "frosted_ice") > 0)) and (def_above.buildable_to and minetest.get_item_group(node_above, "liquid") == 0) then if not minetest.is_protected(pos, player_name) then diff --git a/mods/mcl_flowers/mapgen.lua b/mods/mcl_flowers/mapgen.lua index 8318e9ab1a..6231ea707c 100644 --- a/mods/mcl_flowers/mapgen.lua +++ b/mods/mcl_flowers/mapgen.lua @@ -1,4 +1,4 @@ -minetest.register_alias("mapgen_dandelion", "mcl_flowers:dandelion_yellow") +minetest.register_alias("mapgen_dandelion", "mcl_flowers:dandelion") minetest.register_alias("mapgen_rose", "mcl_flowers:rose") minetest.register_alias("mapgen_oxeye_daisy", "mcl_flowers:oxeye_daisy") @@ -10,9 +10,9 @@ minetest.register_alias("mapgen_tulip_white", "mcl_flowers:tulip_white") minetest.register_alias("mapgen_allium", "mcl_flowers:allium") -minetest.register_alias("mapgen_paeonia", "mcl_flowers:paeonia") +minetest.register_alias("mapgen_poppy", "mcl_flowers:poppy") -minetest.register_alias("mapgen_houstonia", "mcl_flowers:houstonia") +minetest.register_alias("mapgen_azure_bluet", "mcl_flowers:azure_bluet") minetest.register_alias("mapgen_blue_orchid", "mcl_flowers:blue_orchid") @@ -52,15 +52,15 @@ minetest.register_on_generated(function(minp, maxp, seed) if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].buildable_to then nn = minetest.get_node({x=x,y=ground_y,z=z}).name - if nn == "default:dirt_with_grass" then + if nn == "mcl_core:dirt_with_grass" then --local flower_choice = pr:next(1, 11) - local flower_choice = math.random(0, 11) - local flower = "default:grass" + local flower_choice = math.random(0, 10) + local flower = "mcl_core:grass" if flower_choice == 1 then - flower = "mcl_flowers:dandelion_yellow" + flower = "mcl_flowers:dandelion" minetest.set_node(p, {name=flower}) elseif flower_choice == 2 then - flower = "mcl_flowers:rose" + flower = "mcl_flowers:fern" minetest.set_node(p, {name=flower}) elseif flower_choice == 3 then flower = "mcl_flowers:oxeye_daisy" @@ -81,19 +81,16 @@ minetest.register_on_generated(function(minp, maxp, seed) flower = "mcl_flowers:allium" minetest.set_node(p, {name=flower}) elseif flower_choice == 9 then - flower = "mcl_flowers:paeonia" + flower = "mcl_flowers:azure_bluet" minetest.set_node(p, {name=flower}) elseif flower_choice == 10 then - flower = "mcl_flowers:houstonia" + flower = "mcl_flowers:poppy" minetest.set_node(p, {name=flower}) elseif flower_choice == 11 then flower = "mcl_flowers:blue_orchid" minetest.set_node(p, {name=flower}) - elseif flower_choice == 12 then - flower = "mcl_flowers:fern" - minetest.set_node(p, {name=flower}) else - flower = "default:grass" + flower = "mcl_core:grass" minetest.set_node(p, {name=flower}) end diff --git a/mods/mcl_furnaces/depends.txt b/mods/mcl_furnaces/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_furnaces/depends.txt +++ b/mods/mcl_furnaces/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_furnaces/init.lua b/mods/mcl_furnaces/init.lua index 5bbf79dea7..5dbc43850f 100644 --- a/mods/mcl_furnaces/init.lua +++ b/mods/mcl_furnaces/init.lua @@ -1,7 +1,7 @@ local furnace_inactive_formspec = "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_furnace.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[current_name;src;2.75,0.5;1,1;]".. @@ -23,7 +23,7 @@ minetest.register_node("mcl_furnaces:furnace", { is_ground_content = false, stack_max = 64, groups = {cracky=2, deco_block=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", furnace_inactive_formspec) @@ -88,7 +88,7 @@ minetest.register_node("mcl_furnaces:furnace_active", { light_source = 12, drop = "mcl_furnaces:furnace", groups = {cracky=2, not_in_creative_inventory=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", furnace_inactive_formspec) @@ -198,7 +198,7 @@ minetest.register_abm({ meta:set_string("formspec", "size[9,8.75]".. "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg.png^crafting_inventory_furnace.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. "list[current_name;src;2.75,0.5;1,1;]".. @@ -252,9 +252,9 @@ minetest.register_abm({ minetest.register_craft({ output = 'mcl_furnaces:furnace', recipe = { - {'default:cobble', 'default:cobble', 'default:cobble'}, - {'default:cobble', '', 'default:cobble'}, - {'default:cobble', 'default:cobble', 'default:cobble'}, + {'mcl_core:cobble', 'mcl_core:cobble', 'mcl_core:cobble'}, + {'mcl_core:cobble', '', 'mcl_core:cobble'}, + {'mcl_core:cobble', 'mcl_core:cobble', 'mcl_core:cobble'}, } }) diff --git a/mods/mcl_heads/depends.txt b/mods/mcl_heads/depends.txt index 331d858ce9..315237e07b 100644 --- a/mods/mcl_heads/depends.txt +++ b/mods/mcl_heads/depends.txt @@ -1 +1 @@ -default \ No newline at end of file +mcl_core diff --git a/mods/mcl_heads/init.lua b/mods/mcl_heads/init.lua index 16d9854bfa..73b91319e5 100644 --- a/mods/mcl_heads/init.lua +++ b/mods/mcl_heads/init.lua @@ -29,7 +29,7 @@ local function addhead(node, desc) type = "fixed", fixed = { -0.25, -0.5, -0.25, 0.25, 0.0, 0.25, }, }, - sounds = default.node_sound_defaults({ + sounds = mcl_core.node_sound_defaults({ footstep = {name="default_hard_footstep", gain=0.3} }), }) diff --git a/mods/mcl_hoppers/depends.txt b/mods/mcl_hoppers/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_hoppers/depends.txt +++ b/mods/mcl_hoppers/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_hoppers/init.lua b/mods/mcl_hoppers/init.lua index e57db2ba40..ee9203f88e 100644 --- a/mods/mcl_hoppers/init.lua +++ b/mods/mcl_hoppers/init.lua @@ -5,7 +5,7 @@ local chest = minetest.get_content_id("mcl_chests:chest") local mcl_hoppers_formspec = "size[9,7]".. "background[-0.19,-0.25;9.41,10.48;mcl_hoppers_inventory.png]".. - default.inventory_header.. + mcl_core.inventory_header.. "list[current_name;main;2,0.5;5,1;]".. "list[current_player;main;0,2.5;9,3;9]".. "list[current_player;main;0,5.74;9,1;]".. @@ -68,7 +68,7 @@ minetest.register_node("mcl_hoppers:hopper", { minetest.log("action", player:get_player_name().. " takes stuff from mcl_hoppers at "..minetest.pos_to_string(pos)) end, - sounds = default.node_sound_metal_defaults(), + sounds = mcl_core.node_sound_metal_defaults(), }) minetest.register_node("mcl_hoppers:hopper_side", { @@ -128,7 +128,7 @@ minetest.register_node("mcl_hoppers:hopper_side", { minetest.log("action", player:get_player_name().. " takes stuff from mcl_hoppers at "..minetest.pos_to_string(pos)) end, - sounds = default.node_sound_metal_defaults(), + sounds = mcl_core.node_sound_metal_defaults(), }) --make mcl_hopperss suck in blocks minetest.register_abm({ @@ -508,7 +508,7 @@ minetest.register_craftitem("mcl_hoppers:hopper_item", { placed = true end if placed == true then - minetest.sound_play(default.node_sound_metal_defaults().place, { pos = pos2 }) + minetest.sound_play(mcl_core.node_sound_metal_defaults().place, { pos = pos2 }) if not minetest.setting_getbool("creative_mode") then itemstack:take_item() end @@ -519,8 +519,8 @@ minetest.register_craftitem("mcl_hoppers:hopper_item", { minetest.register_craft({ output = "mcl_hoppers:hopper_item", recipe = { - {"default:steel_ingot","","default:steel_ingot"}, - {"default:steel_ingot","mcl_chests:chest","default:steel_ingot"}, - {"","default:steel_ingot",""}, + {"mcl_core:steel_ingot","","mcl_core:steel_ingot"}, + {"mcl_core:steel_ingot","mcl_chests:chest","mcl_core:steel_ingot"}, + {"","mcl_core:steel_ingot",""}, } }) diff --git a/mods/mcl_jukebox/depends.txt b/mods/mcl_jukebox/depends.txt index 331d858ce9..315237e07b 100644 --- a/mods/mcl_jukebox/depends.txt +++ b/mods/mcl_jukebox/depends.txt @@ -1 +1 @@ -default \ No newline at end of file +mcl_core diff --git a/mods/mcl_jukebox/init.lua b/mods/mcl_jukebox/init.lua index 42743bba0e..854abeef9b 100644 --- a/mods/mcl_jukebox/init.lua +++ b/mods/mcl_jukebox/init.lua @@ -66,7 +66,7 @@ minetest.register_craft({ output = 'mcl_jukebox:jukebox', recipe = { {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'default:diamond', 'group:wood'}, + {'group:wood', 'mcl_core:diamond', 'group:wood'}, {'group:wood', 'group:wood', 'group:wood'}, } }) @@ -76,7 +76,7 @@ minetest.register_craft({ minetest.register_node("mcl_jukebox:jukebox", { description = "Jukebox", tiles = {"mcl_jukebox_top.png", "mcl_jukebox_side.png", "mcl_jukebox_side.png"}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), groups = {oddly_breakable_by_hand=1, flammable=1, choppy=3, deco_block=1}, on_construct = function(pos) local meta = minetest.get_meta(pos) diff --git a/mods/mcl_minecarts/depends.txt b/mods/mcl_minecarts/depends.txt index 1b3c7979f0..5d9803d534 100644 --- a/mods/mcl_minecarts/depends.txt +++ b/mods/mcl_minecarts/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core mesecons? diff --git a/mods/mcl_minecarts/rails.lua b/mods/mcl_minecarts/rails.lua index 4310444a15..85b98a4f04 100644 --- a/mods/mcl_minecarts/rails.lua +++ b/mods/mcl_minecarts/rails.lua @@ -38,9 +38,9 @@ minetest.register_node("mcl_minecarts:golden_rail", { minetest.register_craft({ output = "mcl_minecarts:golden_rail 6", recipe = { - {"default:gold_ingot", "", "default:gold_ingot"}, - {"default:gold_ingot", "default:stick", "default:gold_ingot"}, - {"default:gold_ingot", "mesecons:redstone", "default:gold_ingot"}, + {"mcl_core:gold_ingot", "", "mcl_core:gold_ingot"}, + {"mcl_core:gold_ingot", "mcl_core:stick", "mcl_core:gold_ingot"}, + {"mcl_core:gold_ingot", "mesecons:redstone", "mcl_core:gold_ingot"}, } }) diff --git a/mods/mcl_mobitems/depends.txt b/mods/mcl_mobitems/depends.txt new file mode 100644 index 0000000000..315237e07b --- /dev/null +++ b/mods/mcl_mobitems/depends.txt @@ -0,0 +1 @@ +mcl_core diff --git a/mods/mcl_mobitems/init.lua b/mods/mcl_mobitems/init.lua index 3c3050a1c3..141110d6d9 100644 --- a/mods/mcl_mobitems/init.lua +++ b/mods/mcl_mobitems/init.lua @@ -261,7 +261,7 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = "mcl_mobitems:leather", - recipe = { "default:paper", "default:paper" }, + recipe = { "mcl_core:paper", "mcl_core:paper" }, }) minetest.register_craft({ output = "mcl_mobitems:feather 3", diff --git a/mods/mcl_potions/depends.txt b/mods/mcl_potions/depends.txt index 8a9c10aa0f..8360d8597f 100644 --- a/mods/mcl_potions/depends.txt +++ b/mods/mcl_potions/depends.txt @@ -1,3 +1,3 @@ -default +mcl_core mcl_farming mcl_mobitems diff --git a/mods/mcl_potions/init.lua b/mods/mcl_potions/init.lua index 52a7aab958..9914afddd5 100644 --- a/mods/mcl_potions/init.lua +++ b/mods/mcl_potions/init.lua @@ -9,7 +9,7 @@ minetest.register_craftitem("mcl_potions:fermented_spider_eye", { minetest.register_craft({ type = "shapeless", output = "mcl_potions:fermented_spider_eye", - recipe = { "mcl_farming:mushroom_brown", "default:sugar", "mcl_mobitems:spider_eye" }, + recipe = { "mcl_farming:mushroom_brown", "mcl_core:sugar", "mcl_mobitems:spider_eye" }, }) minetest.register_craftitem("mcl_potions:glass_bottle", { @@ -22,8 +22,8 @@ minetest.register_craftitem("mcl_potions:glass_bottle", { minetest.register_craft( { output = "mcl_potions:glass_bottle 3", recipe = { - { "default:glass", "", "default:glass" }, - { "", "default:glass", "" } + { "mcl_core:glass", "", "mcl_core:glass" }, + { "", "mcl_core:glass", "" } } }) @@ -37,9 +37,9 @@ minetest.register_craftitem("mcl_potions:speckled_melon", { minetest.register_craft({ output = "mcl_potions:speckled_melon", recipe = { - {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, - {'default:gold_nugget', 'mcl_farming:melon_item', 'default:gold_nugget'}, - {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, + {'mcl_core:gold_nugget', 'mcl_core:gold_nugget', 'mcl_core:gold_nugget'}, + {'mcl_core:gold_nugget', 'mcl_farming:melon_item', 'mcl_core:gold_nugget'}, + {'mcl_core:gold_nugget', 'mcl_core:gold_nugget', 'mcl_core:gold_nugget'}, } }) diff --git a/mods/mcl_throwing/arrow.lua b/mods/mcl_throwing/arrow.lua index 1aa86b6171..7a210e3884 100644 --- a/mods/mcl_throwing/arrow.lua +++ b/mods/mcl_throwing/arrow.lua @@ -84,8 +84,8 @@ minetest.register_entity("mcl_throwing:arrow_entity", THROWING_ARROW_ENTITY) minetest.register_craft({ output = 'mcl_throwing:arrow 4', recipe = { - {'default:flint'}, - {'default:stick'}, + {'mcl_core:flint'}, + {'mcl_core:stick'}, {'mcl_mobitems:feather'} } }) diff --git a/mods/mcl_throwing/depends.txt b/mods/mcl_throwing/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_throwing/depends.txt +++ b/mods/mcl_throwing/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_throwing/init.lua b/mods/mcl_throwing/init.lua index 4787668417..997dc7dba4 100644 --- a/mods/mcl_throwing/init.lua +++ b/mods/mcl_throwing/init.lua @@ -121,17 +121,17 @@ minetest.register_tool("mcl_throwing:bow_2", { minetest.register_craft({ output = 'mcl_throwing:bow', recipe = { - {'', 'default:stick', 'default:string'}, - {'default:stick', '', 'default:string'}, - {'', 'default:stick', 'default:string'}, + {'', 'mcl_core:stick', 'mcl_core:string'}, + {'mcl_core:stick', '', 'mcl_core:string'}, + {'', 'mcl_core:stick', 'mcl_core:string'}, } }) minetest.register_craft({ output = 'mcl_throwing:bow', recipe = { - {'default:string', 'default:stick', ''}, - {'default:string', '', 'default:stick'}, - {'default:string', 'default:stick', ''}, + {'mcl_core:string', 'mcl_core:stick', ''}, + {'mcl_core:string', '', 'mcl_core:stick'}, + {'mcl_core:string', 'mcl_core:stick', ''}, } }) diff --git a/mods/mcl_tnt/depends.txt b/mods/mcl_tnt/depends.txt index 70715c7b94..03a112deba 100644 --- a/mods/mcl_tnt/depends.txt +++ b/mods/mcl_tnt/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core fire diff --git a/mods/mcl_tnt/init.lua b/mods/mcl_tnt/init.lua index 2b78240236..a08e68e456 100644 --- a/mods/mcl_tnt/init.lua +++ b/mods/mcl_tnt/init.lua @@ -49,7 +49,7 @@ minetest.register_node("mcl_tnt:tnt", { mesecons = {effector = { action_on = tnt.ignite }}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) local TNT_RANGE = 3 @@ -97,7 +97,7 @@ function TNT:on_step(dtime) do_tnt_physics(pos, TNT_RANGE) local meta = minetest.get_meta(pos) minetest.sound_play("tnt_explode", {pos = pos,gain = 1.0,max_hear_distance = 16,}) - if minetest.get_node(pos).name == "default:water_source" or minetest.get_node(pos).name == "default:water_flowing" or minetest.get_node(pos).name == "default:bedrock" or minetest.get_node(pos).name == "protector:display" or minetest.is_protected(pos, "tnt") then + if minetest.get_node(pos).name == "mcl_core:water_source" or minetest.get_node(pos).name == "mcl_core:water_flowing" or minetest.get_node(pos).name == "mcl_core:bedrock" or minetest.get_node(pos).name == "protector:display" or minetest.is_protected(pos, "tnt") then -- Cancel the Explosion self.object:remove() return @@ -108,7 +108,7 @@ function TNT:on_step(dtime) if x*x+y*y+z*z <= TNT_RANGE * TNT_RANGE + TNT_RANGE then local np={x=pos.x+x,y=pos.y+y,z=pos.z+z} local n = minetest.get_node(np) - if n.name ~= "air" and n.name ~= "default:obsidian" and n.name ~= "default:bedrock" and n.name ~= "protector:protect" then + if n.name ~= "air" and n.name ~= "mcl_core:obsidian" and n.name ~= "mcl_core:bedrock" and n.name ~= "protector:protect" then activate_if_tnt(n.name, np, pos, 3) minetest.remove_node(np) core.check_for_falling(np) @@ -136,8 +136,8 @@ minetest.register_entity("mcl_tnt:tnt", TNT) minetest.register_craft({ output = "mcl_tnt:tnt", recipe = { - {'default:gunpowder','group:sand','default:gunpowder'}, - {'group:sand','default:gunpowder','group:sand'}, - {'default:gunpowder','group:sand','default:gunpowder'} + {'mcl_core:gunpowder','group:sand','mcl_core:gunpowder'}, + {'group:sand','mcl_core:gunpowder','group:sand'}, + {'mcl_core:gunpowder','group:sand','mcl_core:gunpowder'} } }) diff --git a/mods/mcl_walls/depends.txt b/mods/mcl_walls/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_walls/depends.txt +++ b/mods/mcl_walls/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_walls/init.lua b/mods/mcl_walls/init.lua index b078c4d1a3..d6ce0d2ffb 100644 --- a/mods/mcl_walls/init.lua +++ b/mods/mcl_walls/init.lua @@ -126,7 +126,7 @@ local function register_wall(nodename, name, texture, invtex) type = "fixed", fixed = take }, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) end @@ -145,7 +145,7 @@ local function register_wall(nodename, name, texture, invtex) type = "fixed", fixed = {pillar, full_blocks[1]} }, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) minetest.register_node(nodename.."_21", { @@ -163,7 +163,7 @@ local function register_wall(nodename, name, texture, invtex) type = "fixed", fixed = {pillar, full_blocks[2]} }, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) -- Inventory item @@ -186,7 +186,7 @@ local function register_wall(nodename, name, texture, invtex) }, collisionbox = {-0.2, 0, -0.2, 0.2, 1.4, 0.2}, on_construct = update_wall, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), }) end @@ -196,8 +196,8 @@ register_wall("mcl_walls:cobble", "Cobblestone Wall", "default_cobble.png", "mcl minetest.register_craft({ output = 'mcl_walls:cobble 6', recipe = { - {'default:cobble', 'default:cobble', 'default:cobble'}, - {'default:cobble', 'default:cobble', 'default:cobble'} + {'mcl_core:cobble', 'mcl_core:cobble', 'mcl_core:cobble'}, + {'mcl_core:cobble', 'mcl_core:cobble', 'mcl_core:cobble'} } }) @@ -207,8 +207,8 @@ register_wall("mcl_walls:mossycobble", "Mossy Cobblestone Wall", "default_mossyc minetest.register_craft({ output = 'mcl_walls:mossycobble 6', recipe = { - {'default:mossycobble', 'default:mossycobble', 'default:mossycobble'}, - {'default:mossycobble', 'default:mossycobble', 'default:mossycobble'} + {'mcl_core:mossycobble', 'mcl_core:mossycobble', 'mcl_core:mossycobble'}, + {'mcl_core:mossycobble', 'mcl_core:mossycobble', 'mcl_core:mossycobble'} } }) diff --git a/mods/mcl_wool/depends.txt b/mods/mcl_wool/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/mcl_wool/depends.txt +++ b/mods/mcl_wool/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/mcl_wool/init.lua b/mods/mcl_wool/init.lua index 869b631040..d5d1fb2977 100644 --- a/mods/mcl_wool/init.lua +++ b/mods/mcl_wool/init.lua @@ -39,7 +39,7 @@ for _, row in ipairs(wool.dyes) do is_ground_content = false, tiles = {"wool_"..texture..".png"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=1,wool=1,building_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) minetest.register_node("mcl_wool:"..name.."_carpet", { description = desc.." Carpet", @@ -48,7 +48,7 @@ for _, row in ipairs(wool.dyes) do tiles = {"wool_"..texture..".png"}, wield_image = "wool_"..name..".png", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=1,carpet=1,deco_block=1}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), paramtype = "light", stack_max = 64, drawtype = "nodebox", diff --git a/mods/mcstair/depends.txt b/mods/mcstair/depends.txt index e95acbcadf..74014a78fb 100644 --- a/mods/mcstair/depends.txt +++ b/mods/mcstair/depends.txt @@ -1 +1,2 @@ -stairs \ No newline at end of file +mcl_core +stairs diff --git a/mods/mcstair/init.lua b/mods/mcstair/init.lua index ef00c2180c..9284c21071 100644 --- a/mods/mcstair/init.lua +++ b/mods/mcstair/init.lua @@ -644,7 +644,7 @@ for _,v in ipairs({ "birchwood", "darkwood" }) do - local t = minetest.registered_nodes["default:"..v].tiles[1] + local t = minetest.registered_nodes["mcl_core:"..v].tiles[1] mcstair.add("stairs:stair_"..v, { { t.."^("..t.."^[transformR90^mcstair_turntexture.png^[makealpha:255,0,255)", diff --git a/mods/minetest-3d_armor/3d_armor/armor.lua b/mods/minetest-3d_armor/3d_armor/armor.lua index eeb01c384c..5912432313 100644 --- a/mods/minetest-3d_armor/3d_armor/armor.lua +++ b/mods/minetest-3d_armor/3d_armor/armor.lua @@ -9,23 +9,23 @@ ARMOR_HEAL_MULTIPLIER = 1 ARMOR_RADIATION_MULTIPLIER = 1 ARMOR_MATERIALS = { wood = "group:wood", - cactus = "default:cactus", - steel = "default:steel_ingot", - bronze = "default:bronze_ingot", - diamond = "default:diamond", - gold = "default:gold_ingot", + cactus = "mcl_core:cactus", + steel = "mcl_core:steel_ingot", + bronze = "mcl_core:bronze_ingot", + diamond = "mcl_core:diamond", + gold = "mcl_core:gold_ingot", mithril = "moreores:mithril_ingot", crystal = "ethereal:crystal_ingot", } ARMOR_FIRE_PROTECT = minetest.get_modpath("ethereal") ~= nil ARMOR_FIRE_NODES = { - {"default:lava_source", 5, 8}, - {"default:lava_flowing", 5, 8}, + {"mcl_core:lava_source", 5, 8}, + {"mcl_core:lava_flowing", 5, 8}, {"fire:basic_flame", 3, 4}, {"fire:permanent_flame", 3, 4}, {"ethereal:crystal_spike", 2, 1}, {"ethereal:fire_flower", 2, 1}, - {"default:torch", 1, 1}, + {"torches:torch", 1, 1}, } local skin_mod = nil @@ -128,7 +128,7 @@ armor.update_player_visuals = function(self, player) end local name = player:get_player_name() if self.textures[name] then - default.player_set_textures(player, { + mcl_core.player_set_textures(player, { self.textures[name].skin, self.textures[name].armor, self.textures[name].wielditem, @@ -325,7 +325,7 @@ end -- Register Player Model -default.player_register_model("3d_armor_character.b3d", { +mcl_core.player_register_model("3d_armor_character.b3d", { animation_speed = 30, textures = { armor.default_skin..".png", @@ -366,7 +366,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end) minetest.register_on_joinplayer(function(player) - default.player_set_model(player, "3d_armor_character.b3d") + mcl_core.player_set_model(player, "3d_armor_character.b3d") local name = player:get_player_name() local player_inv = player:get_inventory() local armor_inv = minetest.create_detached_inventory(name.."_armor", { diff --git a/mods/minetest-3d_armor/3d_armor/depends.txt b/mods/minetest-3d_armor/3d_armor/depends.txt index 3acf737cab..8e577a9e6b 100644 --- a/mods/minetest-3d_armor/3d_armor/depends.txt +++ b/mods/minetest-3d_armor/3d_armor/depends.txt @@ -1,4 +1,4 @@ -default +mcl_core inventory_plus? unified_inventory? fire? diff --git a/mods/minetest-3d_armor/3d_armor/init.lua b/mods/minetest-3d_armor/3d_armor/init.lua index 9c86147401..527610b3a6 100644 --- a/mods/minetest-3d_armor/3d_armor/init.lua +++ b/mods/minetest-3d_armor/3d_armor/init.lua @@ -151,10 +151,10 @@ minetest.register_tool("3d_armor:boots_chain", { local craft_ingreds = { leather = { "mcl_mobitems:leather" }, - steel = { "default:steel_ingot", "default:iron_nugget" }, - gold = { "default:gold_ingot", "default:gold_nugget" }, - diamond = { "default:diamond" }, - chain = { nil, "default:iron_nugget"} , + steel = { "mcl_core:steel_ingot", "mcl_core:iron_nugget" }, + gold = { "mcl_core:gold_ingot", "mcl_core:gold_nugget" }, + diamond = { "mcl_core:diamond" }, + chain = { nil, "mcl_core:iron_nugget"} , } for k, v in pairs(craft_ingreds) do diff --git a/mods/minetest-3d_armor/3d_armor_stand/depends.txt b/mods/minetest-3d_armor/3d_armor_stand/depends.txt index 6117511e5d..0dd0e62156 100644 --- a/mods/minetest-3d_armor/3d_armor_stand/depends.txt +++ b/mods/minetest-3d_armor/3d_armor_stand/depends.txt @@ -1,3 +1,3 @@ 3d_armor -default +mcl_core stairs diff --git a/mods/minetest-3d_armor/3d_armor_stand/init.lua b/mods/minetest-3d_armor/3d_armor_stand/init.lua index 6369fb561c..92b5c07797 100644 --- a/mods/minetest-3d_armor/3d_armor_stand/init.lua +++ b/mods/minetest-3d_armor/3d_armor_stand/init.lua @@ -95,7 +95,7 @@ minetest.register_node("3d_armor_stand:armor_stand", { fixed = {-0.5,-0.5,-0.5, 0.5,1.4,0.5} }, groups = {choppy=2, oddly_breakable_by_hand=2, deco_block=1}, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", armor_stand_formspec) @@ -186,9 +186,9 @@ minetest.register_entity("3d_armor_stand:armor_entity", { minetest.register_craft({ output = "3d_armor_stand:armor_stand", recipe = { - {"default:stick", "default:stick", "default:stick"}, - {"", "default:stick", ""}, - {"default:stick", "stairs:slab_stone", "default:stick"}, + {"mcl_core:stick", "mcl_core:stick", "mcl_core:stick"}, + {"", "mcl_core:stick", ""}, + {"mcl_core:stick", "stairs:slab_stone", "mcl_core:stick"}, } }) diff --git a/mods/minetest-3d_armor/unified_skins/depends.txt b/mods/minetest-3d_armor/unified_skins/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/minetest-3d_armor/unified_skins/depends.txt +++ b/mods/minetest-3d_armor/unified_skins/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/minetest-3d_armor/wieldview/depends.txt b/mods/minetest-3d_armor/wieldview/depends.txt index e5dc742919..6b5c5d0261 100644 --- a/mods/minetest-3d_armor/wieldview/depends.txt +++ b/mods/minetest-3d_armor/wieldview/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core unified_skins diff --git a/mods/minetest-3d_armor/wieldview/transform.lua b/mods/minetest-3d_armor/wieldview/transform.lua index cdf8a05d7b..aeb2eb4429 100644 --- a/mods/minetest-3d_armor/wieldview/transform.lua +++ b/mods/minetest-3d_armor/wieldview/transform.lua @@ -1,8 +1,8 @@ -- Wielded Item Transformations - http://dev.minetest.net/texture wieldview_transform = { - ["default:torch"]="R270", - ["default:sapling"]="R270", + ["torches:torch"]="R270", + ["mcl_core:sapling"]="R270", ["flowers:dandelion_white"]="R270", ["flowers:dandelion_yellow"]="R270", ["flowers:geranium"]="R270", diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index 8987fa09a7..72871df17c 100644 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -211,12 +211,12 @@ local function line_of_sight_water(self, pos1, pos2, stepsize) -- swimming mobs can see you through water if s == false and self.fly - and self.fly_in == "default:water_source" then + and self.fly_in == "mcl_core:water_source" then local nod = minetest.get_node(pos_w).name - if nod == "default:water_source" - or nod == "default:water_flowing" then + if nod == "mcl_core:water_source" + or nod == "mcl_core:water_flowing" then return true end @@ -391,7 +391,7 @@ end -- get node but use fallback for nil or unknown local function node_ok(pos, fallback) - fallback = fallback or "default:dirt" + fallback = fallback or "mcl_core:dirt" local node = minetest.get_node_or_nil(pos) @@ -513,7 +513,7 @@ local do_jump = function(self) }) -- thin blocks that do not need to be jumped - if nod.name == "default:snow" then + if nod.name == "mcl_core:snow" then return end @@ -858,7 +858,7 @@ local function smart_mobs(self, s, p, dist, dtime) if s.y < p1.y then if not minetest.is_protected(s, "") then - minetest.set_node(s, {name = "default:dirt"}) + minetest.set_node(s, {name = "mcl_core:dirt"}) end local sheight = math.ceil(self.collisionbox[5]) + 1 @@ -1186,7 +1186,7 @@ local follow_flop = function(self) -- water swimmers flop when on land if self.fly - and self.fly_in == "default:water_source" + and self.fly_in == "mcl_core:water_source" and self.standing_in ~= self.fly_in then self.state = "flop" @@ -2283,7 +2283,7 @@ minetest.register_entity(name, { water_damage = def.water_damage or 0, lava_damage = def.lava_damage or 0, fall_damage = def.fall_damage or 1, - fall_speed = def.fall_speed or -10, -- must be lower than -2 (default: -10) + fall_speed = def.fall_speed or -10, -- must be lower than -2 (mcl_core: -10) drops = def.drops or {}, armor = def.armor or 100, on_rightclick = def.on_rightclick, @@ -2583,9 +2583,8 @@ end -- set content id's local c_air = minetest.get_content_id("air") local c_ignore = minetest.get_content_id("ignore") -local c_obsidian = minetest.get_content_id("default:obsidian") -local c_brick = minetest.get_content_id("default:obsidianbrick") -local c_chest = minetest.get_content_id("default:chest_locked") +local c_obsidian = minetest.get_content_id("mcl_core:obsidian") +local c_chest = minetest.get_content_id("mcl_core:chest") local c_fire = minetest.get_content_id("fire:basic_flame") -- explosion (cannot break protected or unbreakable nodes) @@ -2634,7 +2633,6 @@ function mobs:explosion(pos, radius, fire, smoke, sound) and data[vi] ~= c_air and data[vi] ~= c_ignore and data[vi] ~= c_obsidian - and data[vi] ~= c_brick and data[vi] ~= c_chest and data[vi] ~= c_fire then diff --git a/mods/mobs/depends.txt b/mods/mobs/depends.txt index 5eb2f179b9..e8924953bc 100644 --- a/mods/mobs/depends.txt +++ b/mods/mobs/depends.txt @@ -1,4 +1,4 @@ -default +mcl_core invisibility? intllib? lucky_block? diff --git a/mods/mobs/spawner.lua b/mods/mobs/spawner.lua index 863674c3ef..092e62b5b4 100644 --- a/mods/mobs/spawner.lua +++ b/mods/mobs/spawner.lua @@ -69,7 +69,7 @@ minetest.register_node("mobs:spawner", { S("> name min_light[0-14] max_light[0-14] max_mobs_in_area[0 to disable] distance[1-20] y_offset[-10 to 10]")) end end, - sounds = default.node_sound_metal_defaults(), + sounds = mcl_core.node_sound_metal_defaults(), }) -- spawner abm diff --git a/mods/mobs_mc/chicken.lua b/mods/mobs_mc/chicken.lua index 008b461971..0736106716 100644 --- a/mods/mobs_mc/chicken.lua +++ b/mods/mobs_mc/chicken.lua @@ -119,7 +119,7 @@ mobs:register_mob("mobs_mc:chicken", { }) ---mobs:register_spawn("mobs_mc:chicken", {"default:dirt_with_grass"}, 20, 8, 7000, 1, 31000) +--mobs:register_spawn("mobs_mc:chicken", {"mcl_core:dirt_with_grass"}, 20, 8, 7000, 1, 31000) -- compatibility diff --git a/mods/mobs_mc/cow.lua b/mods/mobs_mc/cow.lua index 6e4d9d3124..ede5dc865d 100644 --- a/mods/mobs_mc/cow.lua +++ b/mods/mobs_mc/cow.lua @@ -78,7 +78,7 @@ mobs:register_mob("mobs_mc:cow", { follow = "farming:wheat", view_range = 7, replace_rate = 10, - replace_what = {"default:grass_3", "default:grass_4", "default:grass_5", "farming:wheat_8"}, + replace_what = {"mcl_core:grass_3", "mcl_core:grass_4", "mcl_core:grass_5", "farming:wheat_8"}, replace_with = "air", fear_height = 2, on_rightclick = function(self, clicker) @@ -125,7 +125,7 @@ mobs:register_mob("mobs_mc:cow", { end, }) ---mobs:register_spawn("mobs_mc:cow", {"default:dirt_with_grass"}, 20, 8, 7000, 1, 31000) +--mobs:register_spawn("mobs_mc:cow", {"mcl_core:dirt_with_grass"}, 20, 8, 7000, 1, 31000) -- compatibility diff --git a/mods/mobs_mc/creeper.lua b/mods/mobs_mc/creeper.lua index 0a4e88fe09..760faf5c3d 100644 --- a/mods/mobs_mc/creeper.lua +++ b/mods/mobs_mc/creeper.lua @@ -36,7 +36,7 @@ mobs:register_mob("mobs_mc:creeper", { armor = 100, maxdrops = 3, drops = { - {name = "default:gunpowder", + {name = "mcl_core:gunpowder", chance = 1, min = 0, max = 2,}, diff --git a/mods/mobs_mc/depends.txt b/mods/mobs_mc/depends.txt index 183917747b..5413fbe35f 100644 --- a/mods/mobs_mc/depends.txt +++ b/mods/mobs_mc/depends.txt @@ -1,4 +1,4 @@ -default +mcl_core fire mobs mcl_tnt diff --git a/mods/mobs_mc/enderman.lua b/mods/mobs_mc/enderman.lua index 46de690b77..f2fa44fcbe 100644 --- a/mods/mobs_mc/enderman.lua +++ b/mods/mobs_mc/enderman.lua @@ -54,12 +54,12 @@ mobs:register_mob("mobs_mc:enderman", { view_range = 16, attack_type = "dogfight", replace_rate = 1, - replace_what = {"default:torch","default:sand","default:desert_sand","default:cobble","default:dirt","default:dirt_with_glass","default:dirt_with_dry_grass","default:wood","default:stone","default:sandstone"}, + 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_with = "air", replace_offset = -1, }) -mobs:register_spawn("mobs_mc:enderman", { "default:sand", "default:desert_sand"}, 5, -1, 5000, 4, 31000) +mobs:register_spawn("mobs_mc:enderman", { "mcl_core:sand", "mcl_core:desert_sand"}, 5, -1, 5000, 4, 31000) diff --git a/mods/mobs_mc/ghast.lua b/mods/mobs_mc/ghast.lua index 2a463b820d..c74b91ef43 100644 --- a/mods/mobs_mc/ghast.lua +++ b/mods/mobs_mc/ghast.lua @@ -37,7 +37,7 @@ mobs:register_mob("mobs_mc:ghast", { chance = 1, min = 0, max = 1,}, - {name = "default:gunpowder", + {name = "mcl_core:gunpowder", chance = 1, min = 0, max = 2,}, @@ -81,7 +81,7 @@ mobs:register_mob("mobs_mc:ghast", { }) -mobs:register_spawn("mobs_mc:ghast", {"default:flowing_lava", "nether:rack","air"}, 17, -1, 5000, 1, -2000) +mobs:register_spawn("mobs_mc:ghast", {"mcl_core:flowing_lava", "nether:rack","air"}, 17, -1, 5000, 1, -2000) -- fireball (weapon) mobs:register_arrow(":mobs_monster:fireball", { diff --git a/mods/mobs_mc/horse.lua b/mods/mobs_mc/horse.lua index 2b1689a1e6..1bb309ea2c 100644 --- a/mods/mobs_mc/horse.lua +++ b/mods/mobs_mc/horse.lua @@ -318,9 +318,9 @@ mobs:register_mob("mobs_mc:horse3", { end end, }) -mobs:register_spawn("mobs_mc:horse", {"default:dirt_with_dry_grass","es:strange_grass","es:aiden_grass"}, 20, 12, 21000, 1, 12) -mobs:register_spawn("mobs_mc:horse2", {"default:dirt_with_dry_grass"}, 20, 12, 23000, 1, 31000) -mobs:register_spawn("mobs_mc:horse3", {"default:desert_sand"}, 20, 8, 17000, 1, 5) +mobs:register_spawn("mobs_mc:horse", {"mcl_core:dirt_with_dry_grass","es:strange_grass","es:aiden_grass"}, 20, 12, 21000, 1, 12) +mobs:register_spawn("mobs_mc:horse2", {"mcl_core:dirt_with_dry_grass"}, 20, 12, 23000, 1, 31000) +mobs:register_spawn("mobs_mc:horse3", {"mcl_core:desert_sand"}, 20, 8, 17000, 1, 5) -- compatibility diff --git a/mods/mobs_mc/pig.lua b/mods/mobs_mc/pig.lua index a8e3f7664b..b6333cf3e0 100644 --- a/mods/mobs_mc/pig.lua +++ b/mods/mobs_mc/pig.lua @@ -51,7 +51,7 @@ mobs:register_mob("mobs_mc:pig", { look_start = 78, look_end = 108, }, - follow = {"default:apple", "farming:potato", "farming:carrot"}, + follow = {"mcl_core:apple", "farming:potato", "farming:carrot"}, view_range = 5, on_rightclick = function(self, clicker) if not clicker or not clicker:is_player() then @@ -133,7 +133,7 @@ mobs:register_mob("mobs_mc:pig", { end, }) -mobs:register_spawn("mobs_mc:pig", {"default:dirt_with_grass"}, 20, 12, 5000, 1, 31000) +mobs:register_spawn("mobs_mc:pig", {"mcl_core:dirt_with_grass"}, 20, 12, 5000, 1, 31000) --api code to fix diff --git a/mods/mobs_mc/sheep.lua b/mods/mobs_mc/sheep.lua index 9621e70edf..e1a78826cf 100644 --- a/mods/mobs_mc/sheep.lua +++ b/mods/mobs_mc/sheep.lua @@ -124,7 +124,7 @@ print(item:get_name(), minetest.get_item_group(item:get_name(), "dye")) end end, }) ---mobs:register_spawn("mobs_mc:sheep", {"default:dirt_with_grass"}, 20, 12, 5000, 2, 31000) +--mobs:register_spawn("mobs_mc:sheep", {"mcl_core:dirt_with_grass"}, 20, 12, 5000, 2, 31000) -- compatibility diff --git a/mods/mobs_mc/skeleton.lua b/mods/mobs_mc/skeleton.lua index 4563dbc89b..a7402afc3c 100644 --- a/mods/mobs_mc/skeleton.lua +++ b/mods/mobs_mc/skeleton.lua @@ -33,7 +33,7 @@ mobs:register_mob("mobs_mc:skeleton", { chance = 1, min = 0, max = 2,}, - {name = "default:bone", + {name = "mcl_core:bone", chance = 1, min = 0, max = 2,}, @@ -93,11 +93,11 @@ mobs:register_mob("mobs_mc:skeleton2", { damage = 3, armor = 200, drops = { - {name = "default:coal_lump", + {name = "mcl_core:coal_lump", chance = 1, min = 0, max = 1,}, - {name = "default:bone", + {name = "mcl_core:bone", chance = 1, min = 0, max = 2,}, diff --git a/mods/mobs_mc/slimes.lua b/mods/mobs_mc/slimes.lua index 5933b18669..7f780bf789 100644 --- a/mods/mobs_mc/slimes.lua +++ b/mods/mobs_mc/slimes.lua @@ -182,9 +182,9 @@ mobs:register_mob("mobs_mc:greenbig", { end end, }) -mobs:register_spawn("mobs_mc:greensmall", {"default:flowing_water", "default:mossycobble"}, 7, -1, 5000, 4, 31000) -mobs:register_spawn("mobs_mc:greenmedium", {"default:flowing_water", "default:mossycobble"}, 7, -1, 5000, 4, 31000) -mobs:register_spawn("mobs_mc:greenbig", {"default:flowing_water", "default:mossycobble"}, 7, -1, 5000, 4, 31000) +mobs:register_spawn("mobs_mc:greensmall", {"mcl_core:flowing_water", "mcl_core:mossycobble"}, 7, -1, 5000, 4, 31000) +mobs:register_spawn("mobs_mc:greenmedium", {"mcl_core:flowing_water", "mcl_core:mossycobble"}, 7, -1, 5000, 4, 31000) +mobs:register_spawn("mobs_mc:greenbig", {"mcl_core:flowing_water", "mcl_core:mossycobble"}, 7, -1, 5000, 4, 31000) @@ -307,8 +307,8 @@ mobs:register_mob("mobs_mc:lavabig", { end }) -mobs:register_spawn("mobs_mc:lavasmall", {"nether:rack", "default:lava"}, 7, -1, 5000, 4, 31000) -mobs:register_spawn("mobs_mc:lavabig", {"nether:rack", "default:lava"}, 7, -1, 5000, 4, 31000) +mobs:register_spawn("mobs_mc:lavasmall", {"nether:rack", "mcl_core:lava"}, 7, -1, 5000, 4, 31000) +mobs:register_spawn("mobs_mc:lavabig", {"nether:rack", "mcl_core:lava"}, 7, -1, 5000, 4, 31000) -- compatibility mobs:alias_mob("mobs:lavasmall", "mobs_mc:lavasmall") diff --git a/mods/mobs_mc/spider.lua b/mods/mobs_mc/spider.lua index 14323ae1fa..8b253fc97e 100644 --- a/mods/mobs_mc/spider.lua +++ b/mods/mobs_mc/spider.lua @@ -35,12 +35,12 @@ mobs:register_mob("mobs_mc:spider", { floats = 0, group_attack = true, replace_rate = 5, - replace_what = {"default:torch"}, + replace_what = {"torches:torch"}, replace_with = "air", replace_offset = -1, peaceful = false, drops = { - {name = "default:string", + {name = "mcl_core:string", chance = 1, min = 0, max = 2,}, {name = "mcl_mobitems:spider_eye", chance = 3, min = 1, max = 1,}, @@ -57,7 +57,7 @@ mobs:register_mob("mobs_mc:spider", { punch_start = 50, punch_end = 90, }, }) -mobs:register_spawn("mobs_mc:spider", {"default:stone" ,"default:gravel","default:cobble","group:crumbly", "group:cracky", "group:choppy", "group:snappy"}, 4, -1, 17000, 2, 3000) +mobs:register_spawn("mobs_mc:spider", {"mcl_core:stone" ,"mcl_core:gravel","mcl_core:cobble","group:crumbly", "group:cracky", "group:choppy", "group:snappy"}, 4, -1, 17000, 2, 3000) -- compatibility diff --git a/mods/mobs_mc/villager.lua b/mods/mobs_mc/villager.lua index 962934b64f..70d300d807 100644 --- a/mods/mobs_mc/villager.lua +++ b/mods/mobs_mc/villager.lua @@ -113,39 +113,39 @@ mobs:register_mob("mobs_mc:villager", { inv:set_size("offered", 1) local trades = { - {"default:apple 12", "default:clay_lump 1"}, - {"default:coal_lump 20", "default:clay_lump 1"}, - {"default:paper 30", "default:clay_lump 1"}, - {"mobs:leather 10", "default:clay_lump 1"}, - {"default:book 2", "default:clay_lump 1"}, - {"default:clay_lump 3", "default:clay_lump 1"}, - {"farming:potato 15", "default:clay_lump 1"}, - {"farming:wheat 20", "default:clay_lump 1"}, - {"farming:carrot 15", "default:clay_lump 1"}, - {"farming:melon_8 8", "default:clay_lump 1"}, - {"mobs:rotten_flesh 40", "default:clay_lump 1"}, - {"default:gold_ingot 10", "default:clay_lump 1"}, - {"farming:cotton 10", "default:clay_lump 1"}, - {"mcl_wool:white 15", "default:clay_lump 1"}, - {"farming:pumpkin 8", "default:clay_lump 1"}, + {"mcl_core:apple 12", "mcl_core:clay_lump 1"}, + {"mcl_core:coal_lump 20", "mcl_core:clay_lump 1"}, + {"mcl_core:paper 30", "mcl_core:clay_lump 1"}, + {"mobs:leather 10", "mcl_core:clay_lump 1"}, + {"mcl_core:book 2", "mcl_core:clay_lump 1"}, + {"mcl_core:clay_lump 3", "mcl_core:clay_lump 1"}, + {"farming:potato 15", "mcl_core:clay_lump 1"}, + {"farming:wheat 20", "mcl_core:clay_lump 1"}, + {"farming:carrot 15", "mcl_core:clay_lump 1"}, + {"farming:melon_8 8", "mcl_core:clay_lump 1"}, + {"mobs:rotten_flesh 40", "mcl_core:clay_lump 1"}, + {"mcl_core:gold_ingot 10", "mcl_core:clay_lump 1"}, + {"farming:cotton 10", "mcl_core:clay_lump 1"}, + {"mcl_wool:white 15", "mcl_core:clay_lump 1"}, + {"farming:pumpkin 8", "mcl_core:clay_lump 1"}, - {"default:clay_lump 1", "mobs:beef_cooked 5"}, - {"default:clay_lump 1", "mobs:chicken_cooked 7"}, - {"default:clay_lump 1", "farming:cookie 6"}, - {"default:clay_lump 1", "farming:pumpkin_bread 3"}, - {"default:clay_lump 1", "mobs:arrow 10"}, - {"default:clay_lump 3", "mobs:bow_wood 1"}, - {"default:clay_lump 8", "fishing:pole_wood 1"}, - --{"default:clay_lump 4", "potionspack:healthii 1"}, - {"default:clay_lump 1", "cake:cake 1"}, - {"default:clay_lump 10", "mobs:saddle 1"}, - {"default:clay_lump 10", "clock:1 1"}, - {"default:clay_lumpd 10", "compass:0 1"}, - {"default:clay_lump 1", "default:glass 5"}, - {"default:clay_lump 1", "nether:glowstone 3"}, - {"default:clay_lump 3", "mobs:shears 1"}, - {"default:clay_lump 10", "default:sword_diamond 1"}, - {"default:clay_lump 20", "3d_armor:chestplate_diamond 1"}, + {"mcl_core:clay_lump 1", "mobs:beef_cooked 5"}, + {"mcl_core:clay_lump 1", "mobs:chicken_cooked 7"}, + {"mcl_core:clay_lump 1", "farming:cookie 6"}, + {"mcl_core:clay_lump 1", "farming:pumpkin_bread 3"}, + {"mcl_core:clay_lump 1", "mobs:arrow 10"}, + {"mcl_core:clay_lump 3", "mobs:bow_wood 1"}, + {"mcl_core:clay_lump 8", "fishing:pole_wood 1"}, + --{"mcl_core:clay_lump 4", "potionspack:healthii 1"}, + {"mcl_core:clay_lump 1", "cake:cake 1"}, + {"mcl_core:clay_lump 10", "mobs:saddle 1"}, + {"mcl_core:clay_lump 10", "clock:1 1"}, + {"mcl_core:clay_lumpd 10", "compass:0 1"}, + {"mcl_core:clay_lump 1", "mcl_core:glass 5"}, + {"mcl_core:clay_lump 1", "nether:glowstone 3"}, + {"mcl_core:clay_lump 3", "mobs:shears 1"}, + {"mcl_core:clay_lump 10", "mcl_core:sword_diamond 1"}, + {"mcl_core:clay_lump 20", "3d_armor:chestplate_diamond 1"}, } local tradenum = math.random(#trades) inv:set_stack("wanted", 1, ItemStack(trades[tradenum][1])) @@ -168,8 +168,8 @@ mobs:register_mob("mobs_mc:villager", { ]] }) ---mobs:register_spawn("mobs_mc:villager", {"default:gravel"}, 20, 8, 50, 8, 31000) -mobs:register_spawn("mobs_mc:villager", {"default:gravel"}, 20, 8, 500, 2, 31000) +--mobs:register_spawn("mobs_mc:villager", {"mcl_core:gravel"}, 20, 8, 50, 8, 31000) +mobs:register_spawn("mobs_mc:villager", {"mcl_core:gravel"}, 20, 8, 500, 2, 31000) -- compatibility diff --git a/mods/mobs_mc/wolf.lua b/mods/mobs_mc/wolf.lua index 7239fd8cb7..3dbd3b323b 100644 --- a/mods/mobs_mc/wolf.lua +++ b/mods/mobs_mc/wolf.lua @@ -169,7 +169,7 @@ mobs:register_mob("mobs_mc:wolf", { step = 0.5, blood_texture = "mobs_blood.png", }) -mobs:register_spawn("mobs_mc:wolf", {"default:dirt_with_grass","default:dirt","default:snow", "default:snowblock"}, 20, 0, 19000, 1, 31000) +mobs:register_spawn("mobs_mc:wolf", {"mcl_core:dirt_with_grass","mcl_core:dirt","mcl_core:snow", "mcl_core:snowblock"}, 20, 0, 19000, 1, 31000) -- compatibility diff --git a/mods/mobs_mc/zombie.lua b/mods/mobs_mc/zombie.lua index e3c4db3f03..941a176777 100644 --- a/mods/mobs_mc/zombie.lua +++ b/mods/mobs_mc/zombie.lua @@ -36,17 +36,17 @@ mobs:register_mob("mobs_mc:zombie", { chance = 1, min = 0, max = 2,}, - {name = "default:steel_ingot", + {name = "mcl_core:steel_ingot", -- approximation to 8.5% chance = 11, min = 1, max = 1,}, - {name = "default:shovel_steel", + {name = "mcl_core:shovel_steel", -- approximation to 8.5% chance = 11, min = 1, max = 1,}, - {name = "default:sword_steel", + {name = "mcl_core:sword_steel", -- approximation to 8.5% chance = 11, min = 1, diff --git a/mods/mobs_mc/zombiepig.lua b/mods/mobs_mc/zombiepig.lua index efa066ca3b..e2fab14f1a 100644 --- a/mods/mobs_mc/zombiepig.lua +++ b/mods/mobs_mc/zombiepig.lua @@ -16,7 +16,7 @@ mobs:register_mob("mobs_mc:pigman", { mesh = "3d_armor_character.b3d", textures = {{"Original_Zombiepig_Man_by_Fedora_P.png", "3d_armor_trans.png", - minetest.registered_items["default:sword_gold"].inventory_image, + minetest.registered_items["mcl_core:sword_gold"].inventory_image, }}, makes_footstep_sound = true, @@ -31,15 +31,15 @@ mobs:register_mob("mobs_mc:pigman", { chance = 1, min = 0, max = 1,}, - {name = "default:gold_nugget", + {name = "mcl_core:gold_nugget", chance = 1, min = 0, max = 1,}, - {name = "default:gold_ingot", + {name = "mcl_core:gold_ingot", chance = 40, min = 1, max = 1,}, - {name = "default:sword_gold", + {name = "mcl_core:sword_gold", -- approximation to 8.5% chance = 11, min = 1, @@ -84,7 +84,7 @@ mobs:register_mob("mobs_mc:pigman", { }) mobs:register_spawn("mobs_mc:pigman", {"nether:rack"}, 17, -1, 5000, 3, -2000) mobs:register_spawn("mobs_mc:pigman", {"nether:portal"}, 15, -1, 500, 4, 31000) -mobs:register_spawn("mobs_mc:pigman", {"default:obsidian"}, 17, -1, 1900, 1, 31000) +mobs:register_spawn("mobs_mc:pigman", {"mcl_core:obsidian"}, 17, -1, 1900, 1, 31000) -- compatibility diff --git a/mods/playerplus/depends.txt b/mods/playerplus/depends.txt index c12cc51ba8..4d8db0deb7 100644 --- a/mods/playerplus/depends.txt +++ b/mods/playerplus/depends.txt @@ -1,2 +1,2 @@ -default +mcl_core 3d_armor? diff --git a/mods/playerplus/init.lua b/mods/playerplus/init.lua index 5683880916..7e48d6f1ef 100644 --- a/mods/playerplus/init.lua +++ b/mods/playerplus/init.lua @@ -101,7 +101,7 @@ minetest.register_globalstep(function(dtime) end -- am I near a cactus? - local near = minetest.find_node_near(pos, 1, "default:cactus") + local near = minetest.find_node_near(pos, 1, "mcl_core:cactus") if near then -- am I touching the cactus? if so it hurts diff --git a/mods/redstone/mesecons/depends.txt b/mods/redstone/mesecons/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/redstone/mesecons/depends.txt +++ b/mods/redstone/mesecons/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/redstone/mesecons/wires.lua b/mods/redstone/mesecons/wires.lua index deefc01dc5..bc94cc64aa 100644 --- a/mods/redstone/mesecons/wires.lua +++ b/mods/redstone/mesecons/wires.lua @@ -123,7 +123,7 @@ for zmy=0, 1 do state = mesecon.state.off, onstate = "mesecons:wire_"..nodeid.."_on" }}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) minetest.register_node("mesecons:wire_"..nodeid.."_on", { @@ -154,7 +154,7 @@ for zmy=0, 1 do state = mesecon.state.on, offstate = "mesecons:wire_"..nodeid.."_off" }}, - sounds = default.node_sound_defaults(), + sounds = mcl_core.node_sound_defaults(), }) end end @@ -250,7 +250,7 @@ minetest.register_alias("mesecons:redstone", "mesecons:wire_00000000_off") minetest.register_craft({ type = "cooking", output = "mesecons:redstone", - recipe = "default:stone_with_redstone", + recipe = "mcl_core:stone_with_redstone", cooktime = 10, }) diff --git a/mods/redstone/mesecons_button/init.lua b/mods/redstone/mesecons_button/init.lua index 9a91e6a881..f6ce39fd84 100644 --- a/mods/redstone/mesecons_button/init.lua +++ b/mods/redstone/mesecons_button/init.lua @@ -44,7 +44,7 @@ minetest.register_node("mesecons_button:button_stone_off", { minetest.sound_play("mesecons_button_push", {pos=pos}) minetest.after(1, mesecon.button_turnoff, pos) end, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.buttonlike_get @@ -70,7 +70,7 @@ minetest.register_node("mesecons_button:button_stone_on", { groups = {dig_immediate=2, not_in_creative_inventory=1, attached_node=1, dig_by_water=1}, drop = 'mesecons_button:button_stone_off', description = "Stone Button", - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), mesecons = {receptor = { state = mesecon.state.on, rules = mesecon.rules.buttonlike_get @@ -101,7 +101,7 @@ minetest.register_node("mesecons_button:button_wood_off", { minetest.sound_play("mesecons_button_push", {pos=pos}) minetest.after(1, mesecon.button_turnoff, pos) end, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.buttonlike_get @@ -127,7 +127,7 @@ minetest.register_node("mesecons_button:button_wood_on", { groups = {dig_immediate=2, not_in_creative_inventory=1, attached_node=1, dig_by_water=1}, drop = 'mesecons_button:button_wood_off', description = "Wooden Button", - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {receptor = { state = mesecon.state.on, rules = mesecon.rules.buttonlike_get @@ -137,7 +137,7 @@ minetest.register_node("mesecons_button:button_wood_on", { minetest.register_craft({ output = 'mesecons_button:button_stone_off', recipe = { - {'default:stone'}, + {'mcl_core:stone'}, } }) diff --git a/mods/redstone/mesecons_commandblock/init.lua b/mods/redstone/mesecons_commandblock/init.lua index a6b76bdbb5..fb75cdf123 100644 --- a/mods/redstone/mesecons_commandblock/init.lua +++ b/mods/redstone/mesecons_commandblock/init.lua @@ -187,7 +187,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", { after_place_node = after_place, on_receive_fields = receive_fields, can_dig = can_dig, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), mesecons = {effector = { action_on = commandblock_action_on }}, @@ -203,7 +203,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", { after_place_node = after_place, on_receive_fields = receive_fields, can_dig = can_dig, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), mesecons = {effector = { action_off = commandblock_action_off }} diff --git a/mods/redstone/mesecons_delayer/init.lua b/mods/redstone/mesecons_delayer/init.lua index 0cb4f20e7a..580e9d5d4a 100644 --- a/mods/redstone/mesecons_delayer/init.lua +++ b/mods/redstone/mesecons_delayer/init.lua @@ -125,7 +125,7 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), { end, delayer_time = delaytime, delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i), - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), mesecons = { receptor = { @@ -199,6 +199,6 @@ minetest.register_craft({ output = "mesecons_delayer:delayer_off_1", recipe = { {"mesecons_torch:mesecon_torch_on", "", "mesecons_torch:mesecon_torch_on"}, - {"default:stone","default:stone", "default:stone"}, + {"mcl_core:stone","mcl_core:stone", "mcl_core:stone"}, } }) diff --git a/mods/redstone/mesecons_lightstone/init.lua b/mods/redstone/mesecons_lightstone/init.lua index 782391a2c5..74bfd3e54d 100644 --- a/mods/redstone/mesecons_lightstone/init.lua +++ b/mods/redstone/mesecons_lightstone/init.lua @@ -4,7 +4,7 @@ minetest.register_node("mesecons_lightstone:lightstone_off", { groups = {cracky=2, mesecon_effector_off = 1, mesecon = 2}, is_ground_content = false, description= "Redstone Lamp", - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), mesecons = {effector = { action_on = function (pos, node) mesecon:swap_node(pos, "mesecons_lightstone:lightstone_on") @@ -19,7 +19,7 @@ minetest.register_node("mesecons_lightstone:lightstone_on", { drop = "node mesecons_lightstone:lightstone_off", is_ground_content = false, light_source = 14, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), mesecons = {effector = { action_off = function (pos, node) mesecon:swap_node(pos, "mesecons_lightstone:lightstone_off") @@ -31,7 +31,7 @@ minetest.register_craft({ output = "node mesecons_lightstone:lightstone_off", recipe = { {'',"mesecons:redstone",''}, - {"mesecons:redstone",'default:glowstone',"mesecons:redstone"}, + {"mesecons:redstone",'mcl_core:glowstone',"mesecons:redstone"}, {'','mesecons:redstone',''}, } }) diff --git a/mods/redstone/mesecons_materials/depends.txt b/mods/redstone/mesecons_materials/depends.txt index 2768bc1c99..52cee7ffc5 100644 --- a/mods/redstone/mesecons_materials/depends.txt +++ b/mods/redstone/mesecons_materials/depends.txt @@ -1,2 +1,2 @@ mesecons -default +mcl_core diff --git a/mods/redstone/mesecons_materials/init.lua b/mods/redstone/mesecons_materials/init.lua index 3cf7bc3998..bf43f0ca84 100644 --- a/mods/redstone/mesecons_materials/init.lua +++ b/mods/redstone/mesecons_materials/init.lua @@ -8,17 +8,17 @@ minetest.register_craftitem("mesecons_materials:slimeball", { minetest.register_craft({ output = 'mesecons_materials:slimeball', type = "cooking", - recipe = "default:sapling", + recipe = "mcl_core:sapling", cooktime = 10, }) minetest.register_craft({ output = 'mesecons_materials:slimeball 9', - recipe = {{"default:slimeblock"}}, + recipe = {{"mcl_core:slimeblock"}}, }) minetest.register_craft({ - output = "default:slimeblock", + output = "mcl_core:slimeblock", recipe = {{"mesecons_materials:slimeball","mesecons_materials:slimeball","mesecons_materials:slimeball",}, {"mesecons_materials:slimeball","mesecons_materials:slimeball","mesecons_materials:slimeball",}, {"mesecons_materials:slimeball","mesecons_materials:slimeball","mesecons_materials:slimeball",}}, diff --git a/mods/redstone/mesecons_mvps/init.lua b/mods/redstone/mesecons_mvps/init.lua index 53a590600e..2ca7fad7ab 100644 --- a/mods/redstone/mesecons_mvps/init.lua +++ b/mods/redstone/mesecons_mvps/init.lua @@ -123,10 +123,10 @@ function mesecon:mvps_pull_all(pos, direction) -- pos: pos of mvps; direction: d minetest.remove_node(oldpos) end -mesecon:register_mvps_stopper("default:sign") -mesecon:register_mvps_stopper("default:obsidian") -mesecon:register_mvps_stopper("default:bedrock") -mesecon:register_mvps_stopper("default:barrier") +mesecon:register_mvps_stopper("mcl_core:sign") +mesecon:register_mvps_stopper("mcl_core:obsidian") +mesecon:register_mvps_stopper("mcl_core:bedrock") +mesecon:register_mvps_stopper("mcl_core:barrier") mesecon:register_mvps_stopper("mcl_chests:chest") mesecon:register_mvps_stopper("mcl_chests:chest_left") mesecon:register_mvps_stopper("mcl_chests:chest_right") diff --git a/mods/redstone/mesecons_noteblock/init.lua b/mods/redstone/mesecons_noteblock/init.lua index 506bee1463..08771e9cfb 100644 --- a/mods/redstone/mesecons_noteblock/init.lua +++ b/mods/redstone/mesecons_noteblock/init.lua @@ -15,7 +15,7 @@ minetest.register_node("mesecons_noteblock:noteblock", { minetest.add_node(pos, {name = node.name, param2 = param2}) mesecon.noteblock_play(pos, param2) end, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector = { -- play sound when activated action_on = function (pos, node) mesecon.noteblock_play(pos, node.param2) @@ -66,19 +66,19 @@ mesecon.noteblock_play = function (pos, param2) soundname="mesecons_noteblock_gsharp" end local block_below_name = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name - if block_below_name == "default:glass" then + if block_below_name == "mcl_core:glass" then soundname="mesecons_noteblock_hihat" end - if block_below_name == "default:stone" then + if block_below_name == "mcl_core:stone" then soundname="mesecons_noteblock_kick" end - if block_below_name == "default:chest" then + if block_below_name == "mcl_core:chest" then soundname="mesecons_noteblock_snare" end - if block_below_name == "default:tree" then + if block_below_name == "mcl_core:tree" then soundname="mesecons_noteblock_crash" end - if block_below_name == "default:wood" then + if block_below_name == "mcl_core:wood" then soundname="mesecons_noteblock_litecrash" end minetest.sound_play(soundname, diff --git a/mods/redstone/mesecons_pistons/init.lua b/mods/redstone/mesecons_pistons/init.lua index 072c1a499f..b22dee18b3 100644 --- a/mods/redstone/mesecons_pistons/init.lua +++ b/mods/redstone/mesecons_pistons/init.lua @@ -157,7 +157,7 @@ minetest.register_node("mesecons_pistons:piston_normal_off", { is_ground_content = false, after_place_node = piston_orientate, mesecons_piston = pistonspec_normal, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_get_rules @@ -186,7 +186,7 @@ minetest.register_node("mesecons_pistons:piston_normal_on", { node_box = piston_on_box, selection_box = piston_on_box, mesecons_piston = pistonspec_normal, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_get_rules @@ -241,7 +241,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", { is_ground_content = false, after_place_node = piston_orientate, mesecons_piston = pistonspec_sticky, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_get_rules @@ -270,7 +270,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", { node_box = piston_on_box, selection_box = piston_on_box, mesecons_piston = pistonspec_sticky, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_get_rules @@ -372,7 +372,7 @@ minetest.register_node("mesecons_pistons:piston_up_normal_on", { node_box = piston_up_on_box, selection_box = piston_up_on_box, mesecons_piston = pistonspec_normal_up, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_up_rules, @@ -430,7 +430,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_off", { is_ground_content = false, drop = "mesecons_pistons:piston_sticky_off", mesecons_piston = pistonspec_sticky_up, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_up_rules, @@ -459,7 +459,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_on", { node_box = piston_up_on_box, selection_box = piston_up_on_box, mesecons_piston = pistonspec_sticky_up, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_up_rules, @@ -535,7 +535,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_off", { is_ground_content = false, drop = "mesecons_pistons:piston_normal_off", mesecons_piston = pistonspec_normal_down, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_down_rules, @@ -564,7 +564,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_on", { node_box = piston_down_on_box, selection_box = piston_down_on_box, mesecons_piston = pistonspec_normal_down, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_down_rules, @@ -618,7 +618,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_off", { is_ground_content = false, drop = "mesecons_pistons:piston_sticky_off", mesecons_piston = pistonspec_sticky_down, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_on = piston_on, rules = piston_down_rules, @@ -647,7 +647,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_on", { node_box = piston_down_on_box, selection_box = piston_down_on_box, mesecons_piston = pistonspec_sticky_down, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {effector={ action_off = piston_off, rules = piston_down_rules, @@ -750,8 +750,8 @@ minetest.register_craft({ output = 'mesecons_pistons:piston_normal_off', recipe = { {"group:wood", "group:wood", "group:wood"}, - {"default:cobble", "default:steel_ingot", "default:cobble"}, - {"default:cobble", "mesecons:redstone", "default:cobble"}, + {"mcl_core:cobble", "mcl_core:steel_ingot", "mcl_core:cobble"}, + {"mcl_core:cobble", "mesecons:redstone", "mcl_core:cobble"}, } }) diff --git a/mods/redstone/mesecons_pressureplates/init.lua b/mods/redstone/mesecons_pressureplates/init.lua index 73ad8f63ba..7fcf184817 100644 --- a/mods/redstone/mesecons_pressureplates/init.lua +++ b/mods/redstone/mesecons_pressureplates/init.lua @@ -115,7 +115,7 @@ mesecon:register_pressure_plate( "default_wood.png", "default_wood.png", {{"group:wood", "group:wood"}}, - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) mesecon:register_pressure_plate( "mesecons_pressureplates:pressure_plate_stone_off", @@ -123,8 +123,8 @@ mesecon:register_pressure_plate( "Stone Pressure Plate", "default_stone.png", "default_stone.png", - {{"default:stone", "default:stone"}}, - default.node_sound_stone_defaults()) + {{"mcl_core:stone", "mcl_core:stone"}}, + mcl_core.node_sound_stone_defaults()) minetest.register_craft({ type = "fuel", diff --git a/mods/redstone/mesecons_solarpanel/init.lua b/mods/redstone/mesecons_solarpanel/init.lua index d2d5c1caee..52c1a6a912 100644 --- a/mods/redstone/mesecons_solarpanel/init.lua +++ b/mods/redstone/mesecons_solarpanel/init.lua @@ -20,7 +20,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_on", { drop = "mesecons_solarpanel:solar_panel_off", description="Daylight Sensor", groups = {dig_immediate=3, not_in_creative_inventory = 1}, - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.on }}, @@ -49,7 +49,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", { }, groups = {dig_immediate=3}, description="Daylight Sensor", - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.off }}, @@ -62,8 +62,8 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", { minetest.register_craft({ output = 'mesecons_solarpanel:solar_panel_off', recipe = { - {'default:glass', 'default:glass', 'default:glass'}, - {'default:quartz_crystal', 'default:quartz_crystal', 'default:quartz_crystal'}, + {'mcl_core:glass', 'mcl_core:glass', 'mcl_core:glass'}, + {'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal'}, {'group:wood_slab', 'group:wood_slab', 'group:wood_slab'}, } }) @@ -118,7 +118,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_on", { drop = "mesecons_solarpanel:solar_panel_off", groups = {dig_immediate=3, not_in_creative_inventory = 1}, description="Inverted Daylight Sensor", - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.on }}, @@ -148,7 +148,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_off", { drop = "mesecons_solarpanel:solar_panel_off", groups = {dig_immediate=3, not_in_creative_inventory=1}, description="Inverted Daylight Sensor", - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.off }}, diff --git a/mods/redstone/mesecons_torch/init.lua b/mods/redstone/mesecons_torch/init.lua index d72c2da8f4..84c12f8e9c 100644 --- a/mods/redstone/mesecons_torch/init.lua +++ b/mods/redstone/mesecons_torch/init.lua @@ -38,7 +38,7 @@ minetest.register_craft({ output = 'mesecons_torch:mesecon_torch_on', recipe = { {"mesecons:redstone"}, - {"default:stick"},} + {"mcl_core:stick"},} }) local torch_selectionbox = @@ -92,7 +92,7 @@ minetest.register_node("mesecons_torch:redstoneblock", { tiles = {"default_redstone_block.png"}, stack_max = 64, groups = {cracky=1}, - sounds = default.node_sound_stone_defaults(), + sounds = mcl_core.node_sound_stone_defaults(), is_ground_content = false, mesecons = {receptor = { state = mesecon.state.on, diff --git a/mods/redstone/mesecons_walllever/init.lua b/mods/redstone/mesecons_walllever/init.lua index 57763999c4..cda3ab2456 100644 --- a/mods/redstone/mesecons_walllever/init.lua +++ b/mods/redstone/mesecons_walllever/init.lua @@ -35,7 +35,7 @@ minetest.register_node("mesecons_walllever:wall_lever_off", { mesecon:receptor_on(pos, mesecon.rules.buttonlike_get(node)) minetest.sound_play("mesecons_lever", {pos=pos}) end, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {receptor = { rules = mesecon.rules.buttonlike_get, state = mesecon.state.off @@ -75,7 +75,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", { mesecon:receptor_off(pos, mesecon.rules.buttonlike_get(node)) minetest.sound_play("mesecons_lever", {pos=pos}) end, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), mesecons = {receptor = { rules = mesecon.rules.buttonlike_get, state = mesecon.state.on @@ -85,7 +85,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", { minetest.register_craft({ output = 'mesecons_walllever:wall_lever_off', recipe = { - {'default:stick'}, - {'default:cobble'}, + {'mcl_core:stick'}, + {'mcl_core:cobble'}, } }) diff --git a/mods/signs/depends.txt b/mods/signs/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/signs/depends.txt +++ b/mods/signs/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/stairs/depends.txt b/mods/stairs/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/stairs/depends.txt +++ b/mods/stairs/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index cea3a0d47a..70d453084e 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -196,114 +196,114 @@ function stairs.register_stair_and_slab(subname, recipeitem, end -stairs.register_stair("wood", "default:wood", +stairs.register_stair("wood", "mcl_core:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_wood.png"}, "Oak Wood Stairs", - default.node_sound_wood_defaults()) -stairs.register_slab("wood", "default:wood", + mcl_core.node_sound_wood_defaults()) +stairs.register_slab("wood", "mcl_core:wood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_wood.png"}, "Oak Wood Slab", - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) -stairs.register_stair("junglewood", "default:junglewood", +stairs.register_stair("junglewood", "mcl_core:junglewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_junglewood.png"}, "Jungle Wood Stairs", - default.node_sound_wood_defaults()) -stairs.register_slab("junglewood", "default:junglewood", + mcl_core.node_sound_wood_defaults()) +stairs.register_slab("junglewood", "mcl_core:junglewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_junglewood.png"}, "Jungle Wood Slab", - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) -stairs.register_stair("acaciawood", "default:acaciawood", +stairs.register_stair("acaciawood", "mcl_core:acaciawood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_acaciawood.png"}, "Acacia Wood Stairs", - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) -stairs.register_slab("acaciawood", "default:acaciawood", +stairs.register_slab("acaciawood", "mcl_core:acaciawood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_acaciawood.png"}, "Acacia Wood Slab", - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) -stairs.register_stair("sprucewood", "default:sprucewood", +stairs.register_stair("sprucewood", "mcl_core:sprucewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_sprucewood.png"}, "Spruce Wood Stairs", - default.node_sound_wood_defaults()) -stairs.register_slab("sprucewood", "default:sprucewood", + mcl_core.node_sound_wood_defaults()) +stairs.register_slab("sprucewood", "mcl_core:sprucewood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_sprucewood.png"}, "Spruce Wood Slab", - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) -stairs.register_stair("birchwood", "default:birchwood", +stairs.register_stair("birchwood", "mcl_core:birchwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_planks_birch.png"}, "Birch Wood Stairs", - default.node_sound_wood_defaults()) -stairs.register_slab("birchwood", "default:birchwood", + mcl_core.node_sound_wood_defaults()) +stairs.register_slab("birchwood", "mcl_core:birchwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_planks_birch.png"}, "Birch Wood Slab", - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) -stairs.register_stair("darkwood", "default:darkwood", +stairs.register_stair("darkwood", "mcl_core:darkwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_stairs=1}, {"default_planks_big_oak.png"}, "Dark Oak Wood Stairs", - default.node_sound_wood_defaults()) -stairs.register_slab("oakwood", "default:darkwood", + mcl_core.node_sound_wood_defaults()) +stairs.register_slab("oakwood", "mcl_core:darkwood", {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood_slab=1}, {"default_planks_big_oak.png"}, "Dark Oak Wood Slab", - default.node_sound_wood_defaults()) + mcl_core.node_sound_wood_defaults()) -stairs.register_stair_and_slab("stone", "default:stone", +stairs.register_stair_and_slab("stone", "mcl_core:stone", {cracky=3}, {"default_stone.png"}, "Stone Stairs", "Stone Slab", - default.node_sound_stone_defaults()) + mcl_core.node_sound_stone_defaults()) -stairs.register_stair_and_slab("cobble", "default:cobble", +stairs.register_stair_and_slab("cobble", "mcl_core:cobble", {cracky=3}, {"default_cobble.png"}, "Cobblestone Stairs", "Cobblestone Slab", - default.node_sound_stone_defaults()) + mcl_core.node_sound_stone_defaults()) -stairs.register_stair_and_slab("brick", "default:brick", +stairs.register_stair_and_slab("brick", "mcl_core:brick", {cracky=3}, {"default_brick.png"}, "Bricks Stairs", "Bricks Slab", - default.node_sound_stone_defaults()) + mcl_core.node_sound_stone_defaults()) stairs.register_stair_and_slab("sandstone", "group:sandstone", {crumbly=2,cracky=2}, {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_normal.png"}, "Sandstone Stairs", "Sandstone Slab", - default.node_sound_stone_defaults()) + mcl_core.node_sound_stone_defaults()) stairs.register_stair_and_slab("redsandstone", "group:redsandstone", {crumbly=2,cracky=2}, {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"}, "Red Sandstone Stairs", "Red Sandstone Slab", - default.node_sound_stone_defaults()) + mcl_core.node_sound_stone_defaults()) stairs.register_stair_and_slab("stonebrick", "group:stonebrick", {cracky=3}, {"default_stone_brick.png"}, "Stone Bricks Stairs", "Stone Bricks Slab", - default.node_sound_stone_defaults() + mcl_core.node_sound_stone_defaults() ) stairs.register_stair_and_slab("quartzblock", "group:quartz_block", @@ -311,7 +311,7 @@ stairs.register_stair_and_slab("quartzblock", "group:quartz_block", {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"}, "Quartz Stairs", "Quartz Slab", - default.node_sound_stone_defaults() + mcl_core.node_sound_stone_defaults() ) stairs.register_stair_and_slab("purpur_block", "mcl_end:purpur_block", @@ -319,11 +319,11 @@ stairs.register_stair_and_slab("purpur_block", "mcl_end:purpur_block", {"mcl_end_purpur_block.png"}, "Purpur Stairs", "Purpur Slab", - default.node_sound_stone_defaults() + mcl_core.node_sound_stone_defaults() ) minetest.register_craft({ - output = 'default:sandstonecarved', + output = 'mcl_core:sandstonecarved', recipe = { {'stairs:slab_sandstone'}, {'stairs:slab_sandstone'} @@ -331,7 +331,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:redsandstonecarved', + output = 'mcl_core:redsandstonecarved', recipe = { {'stairs:slab_redsandstone'}, {'stairs:slab_redsandstone'} @@ -339,7 +339,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:stonebrickcarved', + output = 'mcl_core:stonebrickcarved', recipe = { {'stairs:slab_stonebrick'}, {'stairs:slab_stonebrick'} diff --git a/mods/torches/depends.txt b/mods/torches/depends.txt index 331d858ce9..315237e07b 100644 --- a/mods/torches/depends.txt +++ b/mods/torches/depends.txt @@ -1 +1 @@ -default \ No newline at end of file +mcl_core diff --git a/mods/torches/init.lua b/mods/torches/init.lua index 5e7de69c13..1e795ff8e1 100644 --- a/mods/torches/init.lua +++ b/mods/torches/init.lua @@ -3,7 +3,7 @@ -- 3d torch part -- -minetest.register_node(":default:torch", { +minetest.register_node("torches:torch", { description = "Torch", drawtype = "mesh", mesh = "torch_floor.obj", @@ -20,13 +20,13 @@ minetest.register_node(":default:torch", { liquids_pointable = false, light_source = 13, groups = {choppy=2, dig_immediate=3, flammable=1, attached_node=1, torch=1, dig_by_water=1, deco_block=1}, - drop = "default:torch", + drop = "torches:torch", selection_box = { type = "wallmounted", wall_top = {-1/16, -2/16, -1/16, 1/16, 0.5, 1/16}, wall_bottom = {-1/16, -0.5, -1/16, 1/16, 2/16, 1/16}, }, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), node_placement_prediction = "", on_place = function(itemstack, placer, pointed_thing) if pointed_thing.type ~= "node" then @@ -51,22 +51,22 @@ minetest.register_node(":default:torch", { -- Prevent placement of ceiling torches return itemstack elseif wdir == 1 then - retval = fakestack:set_name("default:torch") + retval = fakestack:set_name("torches:torch") else - retval = fakestack:set_name("default:torch_wall") + retval = fakestack:set_name("torches:torch_wall") end if not retval then return itemstack end itemstack = minetest.item_place(fakestack, placer, pointed_thing, wdir) - itemstack:set_name("default:torch") + itemstack:set_name("torches:torch") return itemstack end }) -minetest.register_node(":default:torch_wall", { +minetest.register_node("torches:torch_wall", { drawtype = "mesh", mesh = "torch_wall.obj", tiles = {{ @@ -79,25 +79,25 @@ minetest.register_node(":default:torch_wall", { walkable = false, light_source = 13, groups = {choppy=2, dig_immediate=3, flammable=1, not_in_creative_inventory=1, attached_node=1, torch=1, dig_by_water=1}, - drop = "default:torch", + drop = "torches:torch", selection_box = { type = "wallmounted", wall_top = {-0.1, -0.1, -0.1, 0.1, 0.5, 0.1}, wall_bottom = {-0.1, -0.5, -0.1, 0.1, 0.1, 0.1}, wall_side = {-0.5, -0.3, -0.1, -0.2, 0.3, 0.1}, }, - sounds = default.node_sound_wood_defaults(), + sounds = mcl_core.node_sound_wood_defaults(), }) minetest.register_lbm({ name = "torches:convert_wallmounted", - nodenames = {"default:torch", "torches:floor", "torches:wall"}, + nodenames = {"torches:torch", "torches:floor", "torches:wall"}, action = function(pos, node) if node.param2 >= 2 then - minetest.set_node(pos, {name = "default:torch_wall", + minetest.set_node(pos, {name = "torches:torch_wall", param2 = node.param2}) else - minetest.set_node(pos, {name = "default:torch", + minetest.set_node(pos, {name = "torches:torch", param2 = node.param2}) end end diff --git a/mods/xpanes/depends.txt b/mods/xpanes/depends.txt index 4ad96d5159..315237e07b 100644 --- a/mods/xpanes/depends.txt +++ b/mods/xpanes/depends.txt @@ -1 +1 @@ -default +mcl_core diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua index 4b48c16bdd..c6581e74e7 100644 --- a/mods/xpanes/init.lua +++ b/mods/xpanes/init.lua @@ -152,7 +152,7 @@ local pane = function(description, node, append) textures = {"xpanes_pane_glass"..append..".png","xpanes_pane_half_glass"..append..".png","xpanes_top_glass"..append..".png"}, inventory_image = "xpanes_pane_glass"..append..".png", wield_image = "xpanes_pane_glass"..append..".png", - sounds = default.node_sound_glass_defaults(), + sounds = mcl_core.node_sound_glass_defaults(), groups = {snappy=2, cracky=3, oddly_breakable_by_hand=3}, recipe = { {node, node, node}, @@ -168,28 +168,28 @@ xpanes.register_pane("bar", { inventory_image = "xpanes_pane_iron.png", wield_image = "xpanes_pane_iron.png", groups = {cracky=2}, - sounds = default.node_sound_metal_defaults(), + sounds = mcl_core.node_sound_metal_defaults(), recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"} + {"mcl_core:steel_ingot", "mcl_core:steel_ingot", "mcl_core:steel_ingot"}, + {"mcl_core:steel_ingot", "mcl_core:steel_ingot", "mcl_core:steel_ingot"} } }) -- Glass -pane("Glass Pane", "default:glass", "_natural") -pane("Red Stained Glass Pane", "default:glass_red", "_red") -pane("Green Stained Glass Pane", "default:glass_green", "_green") -pane("Blue Stained Glass Pane", "default:glass_blue", "_blue") -pane("Light Blue Stained Glass Pane", "default:glass_light_blue", "_light_blue") -pane("Black Stained Glass Pane", "default:glass_black", "_black") -pane("White Stained Glass Pane", "default:glass_white", "_white") -pane("Yellow Stained Glass Pane", "default:glass_yellow", "_yellow") -pane("Brown Stained Glass Pane", "default:glass_brown", "_brown") -pane("Orange Stained Glass Pane", "default:glass_orange", "_orange") -pane("Pink Stained Glass Pane", "default:glass_pink", "_pink") -pane("Gray Stained Glass Pane", "default:glass_gray", "_gray") -pane("Lime Stained Glass Pane", "default:glass_lime", "_lime") -pane("Light Gray Stained Glass Pane", "default:glass_silver", "_silver") -pane("Magenta Stained Glass Pane", "default:glass_magenta", "_magenta") -pane("Purple Stained Glass Pane", "default:glass_purple", "_purple") -pane("Cyan Stained Glass Pane", "default:glass_cyan", "_cyan") +pane("Glass Pane", "mcl_core:glass", "_natural") +pane("Red Stained Glass Pane", "mcl_core:glass_red", "_red") +pane("Green Stained Glass Pane", "mcl_core:glass_green", "_green") +pane("Blue Stained Glass Pane", "mcl_core:glass_blue", "_blue") +pane("Light Blue Stained Glass Pane", "mcl_core:glass_light_blue", "_light_blue") +pane("Black Stained Glass Pane", "mcl_core:glass_black", "_black") +pane("White Stained Glass Pane", "mcl_core:glass_white", "_white") +pane("Yellow Stained Glass Pane", "mcl_core:glass_yellow", "_yellow") +pane("Brown Stained Glass Pane", "mcl_core:glass_brown", "_brown") +pane("Orange Stained Glass Pane", "mcl_core:glass_orange", "_orange") +pane("Pink Stained Glass Pane", "mcl_core:glass_pink", "_pink") +pane("Gray Stained Glass Pane", "mcl_core:glass_gray", "_gray") +pane("Lime Stained Glass Pane", "mcl_core:glass_lime", "_lime") +pane("Light Gray Stained Glass Pane", "mcl_core:glass_silver", "_silver") +pane("Magenta Stained Glass Pane", "mcl_core:glass_magenta", "_magenta") +pane("Purple Stained Glass Pane", "mcl_core:glass_purple", "_purple") +pane("Cyan Stained Glass Pane", "mcl_core:glass_cyan", "_cyan")