JoseDouglas26
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

More migration

This commit is contained in:
JoseDouglas26 2024-06-17 08:54:21 -03:00
parent 6cd2443913
commit b236788c10
11 changed files with 21 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
mods/ITEMS/mcl_blackstone/init.lua
View File

@ -1,22 +1,5 @@
local S = minetest.get_translator("mcl_blackstone")
local on_rotate
if minetest.get_modpath("screwdriver") then
on_rotate = screwdriver.rotate_3way
end
--Blocks
minetest.register_node("mcl_blackstone:blackstone", {
description = S("Blackstone"),
tiles = {"mcl_blackstone_top.png", "mcl_blackstone_top.png", "mcl_blackstone_side.png"},
sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false,
groups = {cracky = 3, pickaxey=1, material_stone=1, cobble=1},
_mcl_blast_resistance = 6,
_mcl_hardness = 1.5,
})
minetest.register_node("mcl_blackstone:nether_gold", {
description = S("Nether Gold Ore"),
tiles = {"mcl_nether_gold_ore.png"},
@ -97,170 +80,3 @@ minetest.registered_nodes["mcl_fire:fire"].on_construct=function(pos)
end
old_onconstruct(pos)
end
--slabs/stairs
mcl_stairs.register_stair_and_slab("blackstone", "mcl_blackstone:blackstone",
{cracky=3, pickaxey=1, material_stone=1},
{"mcl_blackstone_top.png", "mcl_blackstone_top.png", "mcl_blackstone_side.png"},
S("Blackstone Stairs"),
S("Blackstone Slab"),
mcl_sounds.node_sound_stone_defaults(), 6, 2,
S("Double Blackstone Slab"), nil)
--Wall
mcl_walls.register_wall(
"mcl_blackstone:wall",
S("Blackstone Wall"),
"mcl_blackstone:blackstone",
{
"mcl_blackstone_top.png",
"mcl_blackstone_top.png",
"mcl_blackstone_side.png"
},
"",
{ cracky=3, pickaxey=1, material_stone=1 }
)
--lavacooling
minetest.register_abm({
label = "Lava cooling (basalt)",
nodenames = {"group:lava"},
neighbors = {"mcl_core:ice"},
interval = 1,
chance = 1,
min_y = mcl_vars.mg_end_min,
action = function(pos, node, active_object_count, active_object_count_wider)
local water = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y-1, z=pos.z-1}, {x=pos.x+1, y=pos.y+1, z=pos.z+1}, "mcl_core:ice")
local lavatype = minetest.registered_nodes[node.name].liquidtype
for w=1, #water do
local waternode = minetest.get_node(water[w])
local watertype = minetest.registered_nodes[waternode.name].liquidtype
if water[w].y < pos.y and water[w].x == pos.x and water[w].z == pos.z then
minetest.set_node(water[w], {name="mcl_blackstone:basalt"})
elseif lavatype == "flowing" and water[w].y == pos.y and (water[w].x == pos.x or water[w].z == pos.z) then
minetest.set_node(pos, {name="mcl_blackstone:basalt"})
elseif lavatype == "flowing" and water[w].y > pos.y and water[w].x == pos.x and water[w].z == pos.z then
minetest.set_node(pos, {name="mcl_blackstone:basalt"})
end
end
end,
})
minetest.register_abm({
label = "Lava cooling (blackstone)",
nodenames = {"group:lava"},
neighbors = {"mcl_core:packed_ice"},
interval = 1,
chance = 1,
min_y = mcl_vars.mg_end_min,
action = function(pos, node, active_object_count, active_object_count_wider)
local water = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y-1, z=pos.z-1}, {x=pos.x+1, y=pos.y+1, z=pos.z+1}, "mcl_core:packed_ice")
local lavatype = minetest.registered_nodes[node.name].liquidtype
for w=1, #water do
local waternode = minetest.get_node(water[w])
local watertype = minetest.registered_nodes[waternode.name].liquidtype
if water[w].y < pos.y and water[w].x == pos.x and water[w].z == pos.z then
minetest.set_node(water[w], {name="mcl_blackstone:blackstone"})
elseif lavatype == "flowing" and water[w].y == pos.y and (water[w].x == pos.x or water[w].z == pos.z) then
minetest.set_node(pos, {name="mcl_blackstone:blackstone"})
elseif lavatype == "flowing" and water[w].y > pos.y and water[w].x == pos.x and water[w].z == pos.z then
minetest.set_node(pos, {name="mcl_blackstone:blackstone"})
end
end
end,
})
--crafting
minetest.register_craft({
output = "mcl_blackstone:blackstone_polished 4",
recipe = {
{"mcl_blackstone:blackstone","mcl_blackstone:blackstone"},
{"mcl_blackstone:blackstone","mcl_blackstone:blackstone"},
}
})
minetest.register_craft({
output = "mcl_blackstone:basalt_polished 4",
recipe = {
{"mcl_blackstone:basalt","mcl_blackstone:basalt"},
{"mcl_blackstone:basalt","mcl_blackstone:basalt"},
}
})
minetest.register_craft({
output = "mcl_blackstone:quartz_brick 4",
recipe = {
{"mcl_nether:quartz_block","mcl_nether:quartz_block"},
{"mcl_nether:quartz_block","mcl_nether:quartz_block"},
}
})
minetest.register_craft({
type = "cooking",
output = "mcl_core:gold_ingot",
recipe = "mcl_blackstone:nether_gold",
cooktime = 10,
})
minetest.register_craft({
type = "cooking",
output = "mcl_nether:quartz_smooth",
recipe = "mcl_nether:quartz_block",
cooktime = 10,
})
--[[ Commented out for now because there the discussion how to handle this is ongoing]
--Generating
local specialstones = { "mcl_blackstone:blackstone", "mcl_blackstone:basalt", "mcl_blackstone:soul_soil" }
for s=1, #specialstones do
local node = specialstones[s]
minetest.register_ore({
ore_type = "blob",
ore = node,
wherein = {"mcl_nether:netherrack"},
clust_scarcity = 830,
clust_num_ores = 28,
clust_size = 3,
y_min = mcl_vars.mg_nether_min,
y_max = mcl_vars.mg_nether_max,
})
minetest.register_ore({
ore_type = "blob",
ore = node,
wherein = {"mcl_nether:netherrack"},
clust_scarcity = 8*8*8,
clust_num_ores = 40,
clust_size = 5,
y_min = mcl_vars.mg_nether_min,
y_max = mcl_vars.mg_nether_max,
})
end
if minetest.settings:get_bool("mcl_generate_ores", true) then
end
--]]
--soul torch
mcl_torches.register_torch({
name="soul_torch",
description=S("Soul Torch"),
doc_items_longdesc = S("Torches are light sources which can be placed at the side or on the top of most blocks."),
doc_items_hidden = false,
icon="soul_torch_on_floor.png",
tiles = {{
name = "soul_torch_on_floor_animated.png",
animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 3.3}
}},
light = 12, --soul torches are a bit dimmer than normal torches
groups = {dig_immediate = 3, deco_block = 1},
sounds = mcl_sounds.node_sound_wood_defaults(),
particles = true,
flame_type = 2,
})
minetest.register_craft({
output = "mcl_blackstone:soul_torch 4",
recipe = {
{"group:coal"},
{ "mcl_core:stick" },
{ "group:soul_block" },
}
})

16
mods/ITEMS/mcl_cherry_blossom/nodes.lua
View File

@ -1,16 +0,0 @@
local S = minetest.get_translator(minetest.get_current_modname())
-- Logs
mcl_core.register_tree_trunk("cherrytree", S("Cherry Log"), S("Cherry Bark"),
S("The trunk of a cherry blossom tree."),
"mcl_cherry_blossom_log_top.png", "mcl_cherry_blossom_log.png", "mcl_cherry_blossom:stripped_cherrytree")
-- Leaves
mcl_core.register_leaves("cherryleaves", S("Cherry Leaves"),
S("Cherry blossom leaves are grown from cherry blossom trees."), {"mcl_cherry_blossom_leaves.png"},
nil, "none", nil, "mcl_cherry_blossom:cherrysapling", false, {20, 16, 12, 10})
-- Sapling
mcl_core.register_sapling("cherrysapling", S("Cherry Sapling"),
S("Cherry blossom sapling can be planted to grow cherry trees."), nil,
"mcl_cherry_blossom_sapling.png", {-4/16, -0.5, -4/16, 4/16, 0.25, 4/16})

75
mods/ITEMS/mcl_deepslate/init.lua
View File

@ -1,81 +1,6 @@
local modname = minetest.get_current_modname()
local S = minetest.get_translator(modname)
local copper_mod = minetest.get_modpath("mcl_copper")
local cobble = "mcl_deepslate:deepslate_cobbled"
local stick = "mcl_core:stick"
local function spawn_silverfish(pos, oldnode, oldmetadata, digger)
if not minetest.is_creative_enabled("") then
minetest.add_entity(pos, "mobs_mc:silverfish")
end
end
minetest.register_node("mcl_deepslate:infested_deepslate", {
description = S("Infested Deepslate"),
_doc_items_longdesc = S("An infested block is a block from which a silverfish will pop out when it is broken. It looks identical to its normal counterpart."),
_tt_help = S("Hides a silverfish"),
tiles = { "mcl_deepslate_top.png", "mcl_deepslate_top.png", "mcl_deepslate.png" },
is_ground_content = true,
groups = { dig_immediate = 3, spawns_silverfish = 1, deco_block = 1 },
drop = "",
sounds = mcl_sounds.node_sound_stone_defaults(),
after_dig_node = spawn_silverfish,
_mcl_hardness = 0,
_mcl_blast_resistance = 0.5,
})
local function register_deepslate_ore(desc, drop, cooked, pick, xp)
local item = desc:lower()
local item_string
if item == "lapis lazuli" then
item_string = "lapis"
else
item_string = item
end
local nodename = "mcl_deepslate:deepslate_with_"..item_string
minetest.register_node(nodename, {
description = S("Deepslate "..desc.." Ore"),
_doc_items_longdesc = S("Deepslate "..item.." ore is a variant of "..item.." ore that can generate in deepslate and tuff blobs."),
_doc_items_hidden = false,
tiles = { "mcl_deepslate_"..item_string.."_ore.png" },
is_ground_content = true,
stack_max = 64,
groups = { pickaxey = pick, building_block = 1, material_stone = 1, xp = xp },
drop = drop,
sounds = mcl_sounds.node_sound_stone_defaults(),
_mcl_blast_resistance = 3,
_mcl_hardness = 4.5,
_mcl_silk_touch_drop = true,
_mcl_fortune_drop = mcl_core.fortune_drop_ore,
})
minetest.register_craft({
type = "cooking",
output = cooked,
recipe = nodename,
cooktime = 10,
})
end
local lapis_drops = {
max_items = 1, items = {
{ items = { "mcl_core:lapis 8" }, rarity = 5 },
{ items = { "mcl_core:lapis 7" }, rarity = 5 },
{ items = { "mcl_core:lapis 6" }, rarity = 5 },
{ items = { "mcl_core:lapis 5" }, rarity = 5 },
{ items = { "mcl_core:lapis 4" } }
}
}
local deepslate_ores = {
{ "Lapis Lazuli", lapis_drops, "mcl_core:lapis", 3, 6 },
}
for _, p in pairs(deepslate_ores) do
register_deepslate_ore(p[1], p[2], p[3], p[4], p[5])
end
local redstone_timer = 68.28
local function redstone_ore_activate(pos, node, puncher, pointed_thing)

23
mods/ITEMS/mcl_doors/alias.lua
View File

@ -1,23 +0,0 @@
-- Register aliases
local doornames = {
["door"] = "wooden_door",
["door_jungle"] = "jungle_door",
["door_spruce"] = "spruce_door",
["door_dark_oak"] = "dark_oak_door",
["door_birch"] = "birch_door",
["door_acacia"] = "acacia_door",
["door_iron"] = "iron_door",
}
for oldname, newname in pairs(doornames) do
minetest.register_alias("doors:"..oldname, "mcl_doors:"..newname)
minetest.register_alias("doors:"..oldname.."_t_1", "mcl_doors:"..newname.."_t_1")
minetest.register_alias("doors:"..oldname.."_b_1", "mcl_doors:"..newname.."_b_1")
minetest.register_alias("doors:"..oldname.."_t_2", "mcl_doors:"..newname.."_t_2")
minetest.register_alias("doors:"..oldname.."_b_2", "mcl_doors:"..newname.."_b_2")
end
minetest.register_alias("doors:trapdoor", "mcl_doors:trapdoor")
minetest.register_alias("doors:trapdoor_open", "mcl_doors:trapdoor_open")
minetest.register_alias("doors:iron_trapdoor", "mcl_doors:iron_trapdoor")
minetest.register_alias("doors:iron_trapdoor_open", "mcl_doors:iron_trapdoor_open")

12
mods/ITEMS/mcl_end/building.lua
View File

@ -1,18 +1,6 @@
-- Building blocks and decorative nodes
local S = minetest.get_translator(minetest.get_current_modname())
minetest.register_node("mcl_end:end_stone", {
description = S("End Stone"),
_doc_items_longdesc = doc.sub.items.temp.build,
tiles = {"mcl_end_end_stone.png"},
stack_max = 64,
groups = {pickaxey=1, building_block=1, material_stone=1},
sounds = mcl_sounds.node_sound_stone_defaults(),
after_dig_node = mcl_end.check_detach_chorus_plant,
_mcl_blast_resistance = 9,
_mcl_hardness = 3,
})
minetest.register_node("mcl_end:dragon_egg", {
description = S("Dragon Egg"),
_doc_items_longdesc = S("A dragon egg is a decorative item which can be placed."),

8
mods/ITEMS/mcl_end/chorus_plant.lua
View File

@ -73,7 +73,7 @@ function mcl_end.detach_chorus_plant(start_pos, digger)
if not touched_nodes_hashes[minetest.hash_node_position(pos)] then
local node = minetest.get_node(pos)
touched_nodes_hashes[minetest.hash_node_position(pos)] = true
if node.name == "mcl_end:end_stone" then
if node.name == "blocks:end_stone" then
-- End stone found, the algorithm ends here (haha!)
-- without destroying any nodes, because chorus plants
-- attach to end stone.
@ -167,7 +167,7 @@ minetest.register_node("mcl_end:chorus_flower", {
local node_below = minetest.get_node(below)
local plant_ok = false
-- Condition 1
if node_below.name == "mcl_end:chorus_plant" or node_below.name == "mcl_end:end_stone" then
if node_below.name == "mcl_end:chorus_plant" or node_below.name == "blocks:end_stone" then
plant_ok = true
-- Condition 2
elseif node_below.name == "air" then
@ -260,7 +260,7 @@ minetest.register_node("mcl_end:chorus_plant", {
connect_back = { -0.1875, -0.1875, 0.25, 0.1875, 0.1875, 0.5 },
},
connect_sides = { "top", "bottom", "front", "back", "left", "right" },
connects_to = {"group:chorus_plant", "mcl_end:end_stone"},
connects_to = {"group:chorus_plant", "blocks:end_stone"},
sounds = mcl_sounds.node_sound_wood_defaults(),
drop = {
items = {
@ -293,7 +293,7 @@ minetest.register_node("mcl_end:chorus_plant", {
node_check = node_under
end
local plant_ok = false
if node_check.name == "mcl_end:end_stone" or minetest.get_item_group(node_check.name, "chorus_plant") > 0 then
if node_check.name == "blocks:end_stone" or minetest.get_item_group(node_check.name, "chorus_plant") > 0 then
plant_ok = true
end
if plant_ok then

10
mods/MAPGEN/mcl_biomes/init.lua
View File

@ -3234,7 +3234,7 @@ local function register_dimension_ores()
minetest.register_ore({
ore_type = "stratum",
ore = "mcl_end:end_stone",
ore = "blocks:end_stone",
wherein = end_wherein,
biomes = {"EndSmallIslands", "Endborder"},
y_min = mcl_vars.mg_end_min + 64,
@ -3268,7 +3268,7 @@ local function register_dimension_ores()
minetest.register_ore({
ore_type = "stratum",
ore = "mcl_end:end_stone",
ore = "blocks:end_stone",
wherein = end_wherein,
biomes = {"End", "EndMidlands", "EndHighlands", "EndBarrens"},
y_min = mcl_vars.mg_end_min + 64,
@ -3296,7 +3296,7 @@ local function register_dimension_ores()
minetest.register_ore({
ore_type = "stratum",
ore = "mcl_end:end_stone",
ore = "blocks:end_stone",
wherein = end_wherein,
biomes = {"End", "EndMidlands", "EndHighlands", "EndBarrens"},
y_min = mcl_vars.mg_end_min + 64,
@ -3323,7 +3323,7 @@ local function register_dimension_ores()
})
minetest.register_ore({
ore_type = "stratum",
ore = "mcl_end:end_stone",
ore = "blocks:end_stone",
wherein = end_wherein,
biomes = {"End", "EndMidlands", "EndHighlands", "EndBarrens"},
y_min = mcl_vars.mg_end_min + 64,
@ -6005,7 +6005,7 @@ local function register_dimension_decorations()
minetest.register_decoration({
name = "mcl_biomes:chorus",
deco_type = "simple",
place_on = {"mcl_end:end_stone"},
place_on = {"blocks:end_stone"},
flags = "all_floors",
sidelen = 16,
noise_params = {

4
mods/MAPGEN/mcl_end_island/init.lua
View File

@ -9,7 +9,7 @@ local noisemap = PerlinNoiseMap({
persist = 0.85,
}, {x = (width*2)+1, y = 30, z = (width * 2) + 1}):get_3d_map({x = 0, y = 0, z = 0})
local c_end_stone = minetest.get_content_id("mcl_end:end_stone")
local c_end_stone = minetest.get_content_id("blocks:end_stone")
local y_offset = -2
mcl_mapgen_core.register_generator("end_island", function(vm, data, data2, emin, emax, area, minp, maxp, blockseed)
@ -29,7 +29,7 @@ end, function(minp,maxp,blockseed)
if maxp.y < (-27025 + y_offset) or minp.y > (-27000 + y_offset + 4) or maxp.x < -width or minp.x > width or maxp.z < -width or minp.z > width then
return
end
local nn = minetest.find_nodes_in_area_under_air(minp,maxp,{"mcl_end:end_stone"})
local nn = minetest.find_nodes_in_area_under_air(minp,maxp,{"blocks:end_stone"})
local pr = PseudoRandom(blockseed)
table.shuffle(nn)
if nn and #nn > 0 then

4
mods/MAPGEN/mcl_structures/end_city.lua
View File

@ -16,7 +16,7 @@ local function spawn_shulkers(pos,def,pr)
end
mcl_structures.register_structure("end_shipwreck",{
place_on = {"mcl_end:end_stone"},
place_on = {"blocks:end_stone"},
fill_ratio = 0.001,
flags = "place_center_x, place_center_z, all_floors",
y_offset = function(pr) return pr:next(-50,-20) end,
@ -87,7 +87,7 @@ mcl_structures.register_structure("end_shipwreck",{
})
mcl_structures.register_structure("end_boat",{
place_on = {"mcl_end:end_stone"},
place_on = {"blocks:end_stone"},
fill_ratio = 0.01,
flags = "place_center_x, place_center_z, all_floors",
y_offset = function(pr) return pr:next(15,30) end,

4
mods/MAPGEN/mcl_structures/end_spawn.lua
View File

@ -6,8 +6,8 @@ local modpath = minetest.get_modpath(modname)
mcl_structures.register_structure("end_spawn_obsidian_platform",{
static_pos ={mcl_vars.mg_end_platform_pos},
place_func = function(pos,def,pr)
local obby = minetest.find_nodes_in_area(vector.offset(pos,-2,0,-2),vector.offset(pos,2,0,2),{"air","mcl_end:end_stone"})
local air = minetest.find_nodes_in_area(vector.offset(pos,-2,1,-2),vector.offset(pos,2,3,2),{"air","mcl_end:end_stone"})
local obby = minetest.find_nodes_in_area(vector.offset(pos,-2,0,-2),vector.offset(pos,2,0,2),{"air","blocks:end_stone"})
local air = minetest.find_nodes_in_area(vector.offset(pos,-2,1,-2),vector.offset(pos,2,3,2),{"air","blocks:end_stone"})
minetest.bulk_set_node(obby,{name="mcl_core:obsidian"})
minetest.bulk_set_node(air,{name="air"})
return true

6
mods/blocks/natural/stone.lua
View File

@ -52,6 +52,12 @@ local blocks = {
groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
sounds = mcl_sounds.node_sound_stone_defaults()
},
["end_stone"] = {
_mcl_blast_resistance = 9,
_mcl_hardness = 3,
groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
sounds = mcl_sounds.node_sound_stone_defaults()
},
["granite"] = {
_mcl_blast_resistance = 6,
_mcl_hardness = 1.5,