Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Mineclone2,Mineclonia,Mineclone5 support. #625

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
cfe2ee2
Added Mineclone2 support apart from special machines own recipes with…
JamesClarke7283 Dec 20, 2023
9d0b609
Added Machine Recipes
JamesClarke7283 Dec 20, 2023
535c130
Moved Mineclone2 support for technic to seperate lua file
JamesClarke7283 Dec 20, 2023
ff885f5
Optomised code in mcl_support.lua
JamesClarke7283 Dec 20, 2023
fe30259
Optomised code some more
JamesClarke7283 Dec 20, 2023
35dbebb
More optomization
JamesClarke7283 Dec 20, 2023
420e63e
Ores now generate correctly in technic
JamesClarke7283 Dec 21, 2023
ca56acd
Fixed blocks now minable
JamesClarke7283 Dec 22, 2023
3ed2d96
Fixed blocks not mineable
JamesClarke7283 Dec 22, 2023
e04bafc
Added Smelting recipe for making raw_latex in mineclone2
JamesClarke7283 Dec 22, 2023
cca5d3b
Made cables mineable
JamesClarke7283 Dec 22, 2023
05dc589
Test
JamesClarke7283 Dec 22, 2023
6a23212
Cables breakability Fixed again
JamesClarke7283 Dec 22, 2023
fae9f76
Fixed copper lump grinding recipe for mineclone2
JamesClarke7283 Dec 22, 2023
ffce339
Fixed texture errors
JamesClarke7283 Dec 22, 2023
1087e0c
Added MCL CraftGuide for Machine recipes
JamesClarke7283 Dec 27, 2023
8857680
Add alloy recipes to mcl_craftrecipes
JamesClarke7283 Dec 27, 2023
26a8ab3
Various fixes reccomended by the mod author
JamesClarke7283 Dec 27, 2023
58df66b
Major refactor, put compat ingredients in namespace tables
JamesClarke7283 Dec 27, 2023
9a23138
Made nodes breakable again
JamesClarke7283 Dec 28, 2023
588d36b
Added technic_compat mod to keep compatability functions accessable t…
JamesClarke7283 Dec 28, 2023
b96d32b
Added back LV Furnace Recipe
JamesClarke7283 Dec 28, 2023
abbb4ea
Fixed coal grinding recipe
JamesClarke7283 Dec 28, 2023
5b52a94
Fixed Water Mill Node
JamesClarke7283 Dec 28, 2023
ee0bfa0
Fix geothermal generator
JamesClarke7283 Dec 28, 2023
16b270c
Fixed Water mill code
JamesClarke7283 Dec 28, 2023
21d76f0
Fix Lava geothermal generator
JamesClarke7283 Dec 28, 2023
4f59214
Fix cans
JamesClarke7283 Dec 30, 2023
50191f7
Removed fortune enchant effects from non ores
JamesClarke7283 Dec 31, 2023
af78e5b
Fixed RE battery ingredient
JamesClarke7283 Dec 31, 2023
3b70b56
Misc fixes
JamesClarke7283 Jan 1, 2024
da4f4f5
Fix crash issue
JamesClarke7283 Jan 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions concrete/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@
local technic = rawget(_G, "technic") or {}
technic.concrete_posts = {}

-- Mineclone2 Support
local stone_ingrediant = nil
JamesClarke7283 marked this conversation as resolved.
Show resolved Hide resolved
if minetest.get_modpath("mcl_core") then
stone_ingrediant = "mcl_core:stone"
else
stone_ingrediant = "default:stone"
end

local stone_sounds = nil
if minetest.get_modpath("mcl_sounds") then
stone_sounds = mcl_sounds.node_sound_stone_defaults()
else
stone_sounds = default.node_sound_stone_defaults()
end

-- Boilerplate to support localized strings if intllib mod is installed.
local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end

Expand All @@ -26,9 +41,9 @@ minetest.register_craft({
minetest.register_craft({
output = 'technic:concrete_post 12',
recipe = {
{'default:stone','basic_materials:steel_bar','default:stone'},
{'default:stone','basic_materials:steel_bar','default:stone'},
{'default:stone','basic_materials:steel_bar','default:stone'},
{stone_ingrediant,'basic_materials:steel_bar',stone_ingrediant},
{stone_ingrediant,'basic_materials:steel_bar',stone_ingrediant},
{stone_ingrediant,'basic_materials:steel_bar',stone_ingrediant},
}
})

Expand All @@ -45,7 +60,7 @@ minetest.register_node(":technic:blast_resistant_concrete", {
description = S("Blast-resistant Concrete Block"),
tiles = {"technic_blast_resistant_concrete_block.png",},
groups = {cracky=1, level=3, concrete=1},
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
on_blast = function(pos, intensity)
if intensity > 9 then
minetest.remove_node(pos)
Expand Down Expand Up @@ -80,7 +95,7 @@ minetest.register_node(":technic:concrete_post_platform", {
description = S("Concrete Post Platform"),
tiles = {"basic_materials_concrete_block.png",},
groups={cracky=1, level=2},
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
paramtype = "light",
drawtype = "nodebox",
node_box = {
Expand Down Expand Up @@ -112,7 +127,7 @@ for platform = 0, 1 do
description = S("Concrete Post"),
tiles = {"basic_materials_concrete_block.png"},
groups = {cracky=1, level=2, concrete_post=1, not_in_creative_inventory=platform},
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
drop = (platform == 1 and "technic:concrete_post_platform" or
"technic:concrete_post"),
paramtype = "light",
Expand Down
4 changes: 2 additions & 2 deletions concrete/mod.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name = concrete
depends = default
optional_depends = basic_materials, intllib, moreblocks
optional_depends = basic_materials, intllib, moreblocks, default
supported_games = minetest_game,mineclone2
JamesClarke7283 marked this conversation as resolved.
Show resolved Hide resolved
52 changes: 43 additions & 9 deletions extranodes/init.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
-- Minetest 0.4.6 mod: extranodes
-- namespace: technic
-- Boilerplate to support localized strings if intllib mod is installed.

local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end


-- MineClone2 support
local stone_sounds = nil
if minetest.get_modpath("mcl_sounds") then
stone_sounds = mcl_sounds.node_sound_stone_defaults()
else
stone_sounds = default.node_sound_stone_defaults()
end

wood_fence_ingrediant = nil
if minetest.get_modpath("mcl_core") then
wood_fence_ingrediant = "group:fence_wood"
else
wood_fence_ingrediant = "default:fence_wood"
end

if minetest.get_modpath("moreblocks") then

-- register stairsplus/circular_saw nodes
Expand All @@ -20,7 +37,7 @@ if minetest.get_modpath("moreblocks") then
groups={cracky=3, not_in_creative_inventory=1},
tiles={"technic_marble_bricks.png"},
})

if not minetest.get_modpath("mcl_core") then
stairsplus:register_all("technic", "granite", "technic:granite", {
description=S("Granite"),
groups={cracky=1, not_in_creative_inventory=1},
Expand All @@ -32,7 +49,7 @@ if minetest.get_modpath("moreblocks") then
groups={cracky=1, not_in_creative_inventory=1},
tiles={"technic_granite_bricks.png"},
})

end
stairsplus:register_all("technic", "concrete", "technic:concrete", {
description=S("Concrete"),
groups={cracky=3, not_in_creative_inventory=1},
Expand Down Expand Up @@ -108,7 +125,9 @@ if minetest.get_modpath("moreblocks") then

register_technic_stairs_alias("stairsplus", "concrete", "technic", "concrete")
register_technic_stairs_alias("stairsplus", "marble", "technic", "marble")
if not minetest.get_modpath("mcl_core") then
register_technic_stairs_alias("stairsplus", "granite", "technic", "granite")
JamesClarke7283 marked this conversation as resolved.
Show resolved Hide resolved
end
register_technic_stairs_alias("stairsplus", "marble_bricks", "technic", "marble_bricks")

end
Expand All @@ -120,7 +139,7 @@ local iclip_def = {
tiles = {"technic_insulator_clip.png"},
is_ground_content = false,
groups = {choppy=1, snappy=1, oddly_breakable_by_hand=1 },
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
}

local iclipfence_def = {
Expand Down Expand Up @@ -154,7 +173,7 @@ local iclipfence_def = {
},
connects_to = {"group:fence", "group:wood", "group:tree"},
groups = {fence=1, choppy=1, snappy=1, oddly_breakable_by_hand=1 },
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
}

local sclip_tex = {
Expand Down Expand Up @@ -182,7 +201,7 @@ local sclip_def = {
paramtype = "light",
paramtype2 = "wallmounted",
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
groups = { choppy=1, cracky=1 },
backface_culling = false
}
Expand Down Expand Up @@ -214,21 +233,36 @@ end
minetest.register_node(":technic:insulator_clip", iclip_def)
minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def)

-- MineClone2 support
local stone_ingrediant = nil
local white_dye_ingrediant = nil
local fence_ingrediant = nil

if minetest.get_modpath("mcl_core") then
stone_ingrediant = "mcl_core:stone"
white_dye_ingrediant = "mcl_dye:white"
fence_ingrediant = "group:fence"
else
stone_ingrediant = "default:stone"
white_dye_ingrediant = "dye:white"
fence_ingrediant = "default:fence_wood"
JamesClarke7283 marked this conversation as resolved.
Show resolved Hide resolved
end

minetest.register_craft({
output = "technic:insulator_clip",
recipe = {
{ "", "dye:white", ""},
{ "", white_dye_ingrediant, ""},
{ "", "technic:raw_latex", ""},
{ "technic:raw_latex", "default:stone", "technic:raw_latex"},
{ "technic:raw_latex", stone_ingrediant, "technic:raw_latex"},
}
})

minetest.register_craft({
output = "technic:insulator_clip_fencepost 2",
recipe = {
{ "", "dye:white", ""},
{ "", white_dye_ingrediant, ""},
{ "", "technic:raw_latex", ""},
{ "technic:raw_latex", "default:fence_wood", "technic:raw_latex"},
{ "technic:raw_latex", wood_fence_ingrediant, "technic:raw_latex"},
}
})

Expand Down
5 changes: 3 additions & 2 deletions extranodes/mod.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
name = extranodes
depends = default, technic_worldgen, basic_materials, concrete
optional_depends = unifieddyes, intllib, moreblocks, steel, streetsmod
depends = technic_worldgen, basic_materials, concrete
optional_depends = unifieddyes, intllib, moreblocks, steel, streetsmod, default, mcl_core, mcl_sounds
supported_games = minetest_game,mineclone2
46 changes: 23 additions & 23 deletions technic/crafts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ if pipeworks.enable_teleport_tube then
minetest.register_craft({
output = 'pipeworks:teleport_tube_1',
recipe = {
{'default:mese_crystal', 'technic:copper_coil', 'default:mese_crystal'},
{mese_crystal_ingrediant, 'technic:copper_coil', mese_crystal_ingrediant},
{'pipeworks:tube_1', 'technic:control_logic_unit', 'pipeworks:tube_1'},
{'default:mese_crystal', 'technic:copper_coil', 'default:mese_crystal'},
{mese_crystal_ingrediant, 'technic:copper_coil', mese_crystal_ingrediant},
}
})
end
Expand All @@ -62,36 +62,36 @@ minetest.register_craft( {
minetest.register_craft({
output = 'technic:diamond_drill_head',
recipe = {
{'technic:stainless_steel_ingot', 'default:diamond', 'technic:stainless_steel_ingot'},
{'default:diamond', '', 'default:diamond'},
{'technic:stainless_steel_ingot', 'default:diamond', 'technic:stainless_steel_ingot'},
{'technic:stainless_steel_ingot', diamond_ingrediant, 'technic:stainless_steel_ingot'},
{diamond_ingrediant, '', diamond_ingrediant},
{'technic:stainless_steel_ingot', diamond_ingrediant, 'technic:stainless_steel_ingot'},
}
})

minetest.register_craft({
output = 'technic:green_energy_crystal',
recipe = {
{'default:gold_ingot', 'technic:battery', 'dye:green'},
{gold_ingot_ingrediant, 'technic:battery', green_dye_ingrediant},
{'technic:battery', 'technic:red_energy_crystal', 'technic:battery'},
{'dye:green', 'technic:battery', 'default:gold_ingot'},
{green_dye_ingrediant, 'technic:battery', gold_ingot_ingrediant},
}
})

minetest.register_craft({
output = 'technic:blue_energy_crystal',
recipe = {
{'moreores:mithril_ingot', 'technic:battery', 'dye:blue'},
{'moreores:mithril_ingot', 'technic:battery', blue_dye_ingrediant},
{'technic:battery', 'technic:green_energy_crystal', 'technic:battery'},
{'dye:blue', 'technic:battery', 'moreores:mithril_ingot'},
{blue_dye_ingrediant, 'technic:battery', 'moreores:mithril_ingot'},
}
})

minetest.register_craft({
output = 'technic:red_energy_crystal',
recipe = {
{'moreores:silver_ingot', 'technic:battery', 'dye:red'},
{'moreores:silver_ingot', 'technic:battery', red_dye_ingrediant},
{'technic:battery', 'basic_materials:energy_crystal_simple', 'technic:battery'},
{'dye:red', 'technic:battery', 'moreores:silver_ingot'},
{red_dye_ingrediant, 'technic:battery', 'moreores:silver_ingot'},
}
})

Expand Down Expand Up @@ -143,7 +143,7 @@ minetest.register_craft({
output = 'technic:control_logic_unit',
recipe = {
{'', 'basic_materials:gold_wire', ''},
{'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'},
{copper_ingrediant, 'technic:silicon_wafer', copper_ingrediant},
{'', 'technic:chromium_ingot', ''},
},
replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, },
Expand All @@ -153,8 +153,8 @@ minetest.register_craft({
output = 'technic:mixed_metal_ingot 9',
recipe = {
{'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'},
{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
{bronze_ingrediant, bronze_ingrediant, bronze_ingrediant},
{tin_ingrediant, tin_ingrediant, tin_ingrediant},
}
})

Expand All @@ -175,7 +175,7 @@ minetest.register_craft({
})

minetest.register_craft({
output = "default:dirt 2",
output = dirt_ingrediant.." 2",
type = "shapeless",
replacements = {{"bucket:bucket_water","bucket:bucket_empty"}},
recipe = {
Expand All @@ -191,14 +191,14 @@ minetest.register_craft({
type = "shapeless",
recipe = {
"technic:raw_latex",
"default:coal_lump",
"default:coal_lump",
"default:coal_lump",
"default:coal_lump",
"default:coal_lump",
"default:coal_lump",
"default:coal_lump",
"default:coal_lump",
coal_ingrediant,
coal_ingrediant,
coal_ingrediant,
coal_ingrediant,
coal_ingrediant,
coal_ingrediant,
coal_ingrediant,
coal_ingrediant,
},
})

Expand Down
10 changes: 10 additions & 0 deletions technic/init.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
-- namespace: technic
-- (c) 2012-2013 by RealBadAngel <[email protected]>





if not minetest.get_translator then
error("[technic] Your Minetest version is no longer supported."
.. " (version < 5.0.0)")
end



local load_start = os.clock()

technic = rawget(_G, "technic") or {}
Expand Down Expand Up @@ -37,6 +43,10 @@ local S = technic.getter
-- Read configuration file
dofile(modpath.."/config.lua")


-- MineClone2 Support
dofile(modpath.."/mcl_support.lua")

-- Helper functions
dofile(modpath.."/helpers.lua")

Expand Down
4 changes: 2 additions & 2 deletions technic/items.lua
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ minetest.register_node("technic:machine_casing", {
paramtype = "light",
drawtype = "allfaces",
tiles = {"technic_machine_casing.png"},
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
})

minetest.register_craftitem("technic:rubber_goo", {
Expand Down Expand Up @@ -188,7 +188,7 @@ for p = 0, 35 do
is_ground_content = true,
groups = {uranium_block=1, not_in_creative_inventory=nici,
cracky=1, level=2, radioactive=radioactivity},
sounds = default.node_sound_stone_defaults(),
sounds = stone_sounds,
});
if not ov then
minetest.register_craft({
Expand Down
6 changes: 3 additions & 3 deletions technic/machines/HV/forcefield.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ local cable_entry = "^technic_cable_connection_overlay.png"
minetest.register_craft({
output = "technic:forcefield_emitter_off",
recipe = {
{"default:mese", "basic_materials:motor", "default:mese" },
{mese_block_ingrediant, "basic_materials:motor", mese_block_ingrediant },
{"technic:deployer_off", "technic:machine_casing", "technic:deployer_off"},
{"default:mese", "technic:hv_cable", "default:mese" },
{mese_block_ingrediant, "technic:hv_cable", mese_block_ingrediant },
JamesClarke7283 marked this conversation as resolved.
Show resolved Hide resolved
}
})

Expand Down Expand Up @@ -354,7 +354,7 @@ minetest.register_node("technic:forcefield", {
drawtype = "glasslike",
groups = {not_in_creative_inventory=1},
paramtype = "light",
light_source = default.LIGHT_MAX,
light_source = mt_light_max,
diggable = false,
drop = '',
tiles = {{
Expand Down
Loading