From: RealBadAngel Date: Sat, 30 Mar 2013 10:36:45 +0000 (+0100) Subject: update X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=279776ff62951a8a9ab96b86b03b7558e77a1c87;p=zefram%2Fminetest%2Ftechnic.git update --- diff --git a/technic/depends.txt b/technic/depends.txt index 94cbcf4..90f17c0 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -2,3 +2,4 @@ moreores pipeworks mesecons moreblocks +technic_worldgen diff --git a/technic/grinder.lua b/technic/grinder.lua index fac667d..13fcfc3 100644 --- a/technic/grinder.lua +++ b/technic/grinder.lua @@ -172,7 +172,7 @@ minetest.register_craft({ output = 'technic:grinder', recipe = { {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, - {'default:desert_stone', 'technic:diamond', 'default:desert_stone'}, + {'default:desert_stone', 'default:diamond', 'default:desert_stone'}, {'default:stone', 'moreores:copper_ingot', 'default:stone'}, } }) diff --git a/technic/init.lua b/technic/init.lua index a05fe3c..e57c7a2 100644 --- a/technic/init.lua +++ b/technic/init.lua @@ -1,4 +1,4 @@ --- Minetest 0.4.4d1 : technic +-- Minetest 0.4.6 : technic modpath=minetest.get_modpath("technic") @@ -7,10 +7,6 @@ dofile(modpath.."/config.lua") --helper functions dofile(modpath.."/helpers.lua") --- world gen -dofile(modpath.."/ores.lua") -if enable_rubber_tree_generation==true then dofile(modpath.."/rubber.lua") end - -- chests dofile(modpath.."/chest_commons.lua") dofile(modpath.."/iron_chest.lua") diff --git a/technic/items.lua b/technic/items.lua index f0392bc..7d18570 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -66,29 +66,12 @@ minetest.register_craftitem( "technic:diamond_drill_head", { minetest.register_craft({ output = 'technic:diamond_drill_head', recipe = { - {'technic:stainless_steel_ingot', 'technic:diamond', 'technic:stainless_steel_ingot'}, - {'technic:diamond', '', 'technic:diamond'}, - {'technic:stainless_steel_ingot', 'technic:diamond', 'technic:stainless_steel_ingot'}, + {'technic:stainless_steel_ingot', 'default:diamond', 'technic:stainless_steel_ingot'}, + {'default:diamond', '', 'default:diamond'}, + {'technic:stainless_steel_ingot', 'default:diamond', 'technic:stainless_steel_ingot'}, } }) -minetest.register_craft({ - output = 'technic:diamond_block', - recipe = { - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, - } -}) - -minetest.register_node( "technic:diamond_block", { - description = "Diamond Block", - tiles = { "technic_diamond_block.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - minetest.register_craft({ output = 'technic:green_energy_crystal', recipe = { @@ -111,7 +94,7 @@ minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { {'moreores:gold_ingot', 'technic:battery', 'dye:red'}, - {'technic:battery', 'technic:diamond_block', 'technic:battery'}, + {'technic:battery', 'default:diamondblock', 'technic:battery'}, {'dye:red', 'technic:battery', 'moreores:gold_ingot'}, } }) diff --git a/technic/mining_laser_mk1.lua b/technic/mining_laser_mk1.lua index a00af81..5bafb6c 100644 --- a/technic/mining_laser_mk1.lua +++ b/technic/mining_laser_mk1.lua @@ -75,7 +75,7 @@ minetest.register_tool("technic:laser_mk1", { minetest.register_craft({ output = 'technic:laser_mk1', recipe = { - {'technic:diamond', 'default:steel_ingot', 'technic:battery'}, + {'default:diamond', 'default:steel_ingot', 'technic:battery'}, {'', 'default:steel_ingot', 'technic:battery'}, {'', '', 'moreores:copper_ingot'}, } diff --git a/technic/music_player.lua b/technic/music_player.lua index ecb1e09..81b9a65 100644 --- a/technic/music_player.lua +++ b/technic/music_player.lua @@ -3,7 +3,7 @@ minetest.register_craft({ output = 'technic:music_player', recipe = { {'default:wood', 'default:wood', 'default:wood'}, - {'technic:diamond', 'technic:diamond', 'technic:diamond'}, + {'default:diamond', 'default:diamond', 'default:diamond'}, {'default:stone', 'moreores:copper_ingot', 'default:stone'}, } }) diff --git a/technic/ores.lua b/technic/ores.lua deleted file mode 100644 index cfd5d2a..0000000 --- a/technic/ores.lua +++ /dev/null @@ -1,314 +0,0 @@ -minetest.register_node( "technic:marble", { - description = "Marble", - tiles = { "technic_marble.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_node( "technic:marble_bricks", { - description = "Marble Bricks", - tiles = { "technic_marble_bricks.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - -minetest.register_craft({ - output = 'technic:marble_bricks 4', - recipe = { - {'technic:marble','technic:marble'}, - {'technic:marble','technic:marble'} - } -}) - -minetest.register_node( "technic:granite", { - description = "Granite", - tiles = { "technic_granite.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) - --- cross-compatibility with default obsidian - -function register_technic_stairs_alias(modname, origname, newmod, newname) - minetest.register_alias(modname .. ":slab_" .. origname, newmod..":slab_" .. newname) - minetest.register_alias(modname .. ":slab_" .. origname .. "_inverted", newmod..":slab_" .. newname .. "_inverted") - minetest.register_alias(modname .. ":slab_" .. origname .. "_wall", newmod..":slab_" .. newname .. "_wall") - minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter", newmod..":slab_" .. newname .. "_quarter") - minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter_inverted", newmod..":slab_" .. newname .. "_quarter_inverted") - minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter_wall", newmod..":slab_" .. newname .. "_quarter_wall") - minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter", newmod..":slab_" .. newname .. "_three_quarter") - minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter_inverted", newmod..":slab_" .. newname .. "_three_quarter_inverted") - minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter_wall", newmod..":slab_" .. newname .. "_three_quarter_wall") - minetest.register_alias(modname .. ":stair_" .. origname, newmod..":stair_" .. newname) - minetest.register_alias(modname .. ":stair_" .. origname .. "_inverted", newmod..":stair_" .. newname .. "_inverted") - minetest.register_alias(modname .. ":stair_" .. origname .. "_wall", newmod..":stair_" .. newname .. "_wall") - minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half", newmod..":stair_" .. newname .. "_wall_half") - minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half_inverted", newmod..":stair_" .. newname .. "_wall_half_inverted") - minetest.register_alias(modname .. ":stair_" .. origname .. "_half", newmod..":stair_" .. newname .. "_half") - minetest.register_alias(modname .. ":stair_" .. origname .. "_half_inverted", newmod..":stair_" .. newname .. "_half_inverted") - minetest.register_alias(modname .. ":stair_" .. origname .. "_right_half", newmod..":stair_" .. newname .. "_right_half") - minetest.register_alias(modname .. ":stair_" .. origname .. "_right_half_inverted", newmod..":stair_" .. newname .. "_right_half_inverted") - minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half", newmod..":stair_" .. newname .. "_wall_half") - minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half_inverted", newmod..":stair_" .. newname .. "_wall_half_inverted") - minetest.register_alias(modname .. ":stair_" .. origname .. "_inner", newmod..":stair_" .. newname .. "_inner") - minetest.register_alias(modname .. ":stair_" .. origname .. "_inner_inverted", newmod..":stair_" .. newname .. "_inner_inverted") - minetest.register_alias(modname .. ":stair_" .. origname .. "_outer", newmod..":stair_" .. newname .. "_outer") - minetest.register_alias(modname .. ":stair_" .. origname .. "_outer_inverted", newmod..":stair_" .. newname .. "_outer_inverted") - minetest.register_alias(modname .. ":panel_" .. origname .. "_bottom", newmod..":panel_" .. newname .. "_bottom") - minetest.register_alias(modname .. ":panel_" .. origname .. "_top", newmod..":panel_" .. newname .. "_top") - minetest.register_alias(modname .. ":panel_" .. origname .. "_vertical", newmod..":panel_" .. newname .. "_vertical") - minetest.register_alias(modname .. ":micro_" .. origname .. "_bottom", newmod..":micro_" .. newname .. "_bottom") - minetest.register_alias(modname .. ":micro_" .. origname .. "_top", newmod..":micro_" .. newname .. "_top") -end - - -minetest.register_alias("technic:obsidian", "default:obsidian") -minetest.register_alias("moreblocks:obsidian", "default:obsidian") - -register_stair_slab_panel_micro( - ":default", - "obsidian", - "default:obsidian", - {cracky=3, not_in_creative_inventory=1}, - {"default_obsidian.png"}, - "Obsidian", - "default:obsidian", - "none", - light -) - -register_technic_stairs_alias("moreblocks", "obsidian", "default", "obsidian") -table.insert(circular_saw.known_stairs, "default:obsidian") - --- other stairs/slabs - -if type(register_stair_and_slab_and_panel_and_micro) == "function" then -register_stair_and_slab_and_panel_and_micro(":stairsplus", "marble", "technic:marble", - {cracky=3, not_in_creative_inventory=1}, - {"technic_marble.png"}, - "Marble Stairs", - "Marble Slab", - "Marble Panel", - "Marble Microblock", - "marble") -register_stair_and_slab_and_panel_and_micro(":stairsplus", "marble_bricks", "technic:marble_bricks", - {cracky=3, not_in_creative_inventory=1}, - {"technic_marble_bricks.png"}, - "Marble Bricks Stairs", - "Marble Bricks Slab", - "Marble Bricks Panel", - "Marble Bricks Microblock", - "marble_bricks") -register_stair_and_slab_and_panel_and_micro(":stairsplus", "granite", "technic:granite", - {cracky=3, not_in_creative_inventory=1}, - {"technic_granite.png"}, - "Granite Stairs", - "Granite Slab", - "Granite Panel", - "Granite Microblock", - "granite") -register_stair_and_slab_and_panel_and_micro(":stairsplus", "obsidian", "default:obsidian", - {cracky=3, not_in_creative_inventory=1}, - {"default_obsidian.png"}, - "Obsidian Stairs", - "Obsidian Slab", - "Obsidian Panel", - "Obsidian Microblock", - "obsidian") -end - -if type(register_stair_slab_panel_micro) == "function" then -register_stair_slab_panel_micro(":stairsplus", "marble", "technic:marble", - {cracky=3, not_in_creative_inventory=1}, - {"technic_marble.png"}, - "Marble Stairs", - "Marble Slab", - "Marble Panel", - "Marble Microblock", - "marble") -register_stair_slab_panel_micro(":stairsplus", "marble_bricks", "technic:marble_bricks", - {cracky=3, not_in_creative_inventory=1}, - {"technic_marble_bricks.png"}, - "Marble Bricks Stairs", - "Marble Bricks Slab", - "Marble Bricks Panel", - "Marble Bricks Microblock", - "marble_bricks") -register_stair_slab_panel_micro(":stairsplus", "granite", "technic:granite", - {cracky=3, not_in_creative_inventory=1}, - {"technic_granite.png"}, - "Granite Stairs", - "Granite Slab", - "Granite Panel", - "Granite Microblock", - "granite") -register_stair_slab_panel_micro(":stairsplus", "obsidian", "technic:obsidian", - {cracky=3, not_in_creative_inventory=1}, - {"technic_obsidian.png"}, - "Obsidian Stairs", - "Obsidian Slab", - "Obsidian Panel", - "Obsidian Microblock", - "obsidian") -end - -minetest.register_node( "technic:mineral_diamond", { - description = "Diamond Ore", - tiles = { "default_stone.png^technic_mineral_diamond.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:diamond" 1', -}) - -minetest.register_craftitem( "technic:diamond", { - description = "Diamond", - inventory_image = "technic_diamond.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_node( "technic:mineral_uranium", { - description = "Uranium Ore", - tiles = { "default_stone.png^technic_mineral_uranium.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:uranium" 1', -}) - -minetest.register_craftitem( "technic:uranium", { - description = "Uranium", - inventory_image = "technic_uranium.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_node( "technic:mineral_chromium", { - description = "Chromium Ore", - tiles = { "default_stone.png^technic_mineral_chromium.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:chromium_lump" 1', -}) - -minetest.register_craftitem( "technic:chromium_lump", { - description = "Chromium Lump", - inventory_image = "technic_chromium_lump.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craftitem( "technic:chromium_ingot", { - description = "Chromium Ingot", - inventory_image = "technic_chromium_ingot.png", - on_place_on_ground = minetest.craftitem_place_item, -}) - -minetest.register_craft({ - type = 'cooking', - output = "technic:chromium_ingot", - recipe = "technic:chromium_lump" - }) - - -minetest.register_node( "technic:mineral_zinc", { - description = "Zinc Ore", - tile_images = { "default_stone.png^technic_mineral_zinc.png" }, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - drop = 'craft "technic:zinc_lump" 1', -}) - -minetest.register_craftitem( "technic:zinc_lump", { - description = "Zinc Lump", - inventory_image = "technic_zinc_lump.png", -}) - -minetest.register_craftitem( "technic:zinc_ingot", { - description = "Zinc Ingot", - inventory_image = "technic_zinc_ingot.png", -}) - -minetest.register_craftitem( "technic:stainless_steel_ingot", { - description = "Stainless Steel Ingot", - inventory_image = "technic_stainless_steel_ingot.png", -}) - -minetest.register_craftitem( "technic:brass_ingot", { - description = "Brass Ingot", - inventory_image = "technic_brass_ingot.png", -}) - -minetest.register_craft({ - type = 'cooking', - output = "technic:zinc_ingot", - recipe = "technic:zinc_lump" - }) - -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_diamond", - wherein = "default:stone", - clust_scarcity = 11*11*11, - clust_num_ores = 4, - clust_size = 3, - height_min = -31000, - height_max = -450, -}) -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_uranium", - wherein = "default:stone", - clust_scarcity = 10*10*10, - clust_num_ores = 4, - clust_size = 3, - height_min = -300, - height_max = -80, -}) -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_chromium", - wherein = "default:stone", - clust_scarcity = 10*10*10, - clust_num_ores = 2, - clust_size = 3, - height_min = -31000, - height_max = -100, -}) -minetest.register_ore({ - ore_type = "scatter", - ore = "technic:mineral_zinc", - wherein = "default:stone", - clust_scarcity = 9*9*9, - clust_num_ores = 4, - clust_size = 3, - height_min = -31000, - height_max = 2, -}) -minetest.register_ore({ - ore_type = "sheet", - ore = "technic:marble", - wherein = "default:stone", - clust_scarcity = 1, - clust_num_ores = 1, - clust_size = 3, - height_min = -150, - height_max = -50, - noise_threshhold = 0.5, - noise_params = {offset=0, scale=15, spread={x=150, y=150, z=150}, seed=23, octaves=3, persist=0.70} -}) -minetest.register_ore({ - ore_type = "sheet", - ore = "technic:granite", - wherein = "default:stone", - clust_scarcity = 1, - clust_num_ores = 1, - clust_size = 4, - height_min = -100, - height_max = -250, - noise_threshhold = 0.5, - noise_params = {offset=0, scale=15, spread={x=130, y=130, z=130}, seed=24, octaves=3, persist=0.70} -}) diff --git a/technic/textures/technic_brass_dust.png b/technic/textures/technic_brass_dust.png deleted file mode 100644 index 63d9ba4..0000000 Binary files a/technic/textures/technic_brass_dust.png and /dev/null differ diff --git a/technic/textures/technic_brass_ingot.png b/technic/textures/technic_brass_ingot.png deleted file mode 100644 index 2d8b153..0000000 Binary files a/technic/textures/technic_brass_ingot.png and /dev/null differ diff --git a/technic/textures/technic_chromium_ingot.png b/technic/textures/technic_chromium_ingot.png deleted file mode 100644 index 91d5b20..0000000 Binary files a/technic/textures/technic_chromium_ingot.png and /dev/null differ diff --git a/technic/textures/technic_chromium_lump.png b/technic/textures/technic_chromium_lump.png deleted file mode 100644 index 1588f92..0000000 Binary files a/technic/textures/technic_chromium_lump.png and /dev/null differ diff --git a/technic/textures/technic_concrete_block.png b/technic/textures/technic_concrete_block.png deleted file mode 100644 index cd94594..0000000 Binary files a/technic/textures/technic_concrete_block.png and /dev/null differ diff --git a/technic/textures/technic_granite.png b/technic/textures/technic_granite.png deleted file mode 100644 index abb1385..0000000 Binary files a/technic/textures/technic_granite.png and /dev/null differ diff --git a/technic/textures/technic_marble.png b/technic/textures/technic_marble.png deleted file mode 100644 index 846a170..0000000 Binary files a/technic/textures/technic_marble.png and /dev/null differ diff --git a/technic/textures/technic_marble_bricks.png b/technic/textures/technic_marble_bricks.png deleted file mode 100644 index 2ea1e42..0000000 Binary files a/technic/textures/technic_marble_bricks.png and /dev/null differ diff --git a/technic/textures/technic_mineral_chromium.png b/technic/textures/technic_mineral_chromium.png deleted file mode 100644 index c66f1c5..0000000 Binary files a/technic/textures/technic_mineral_chromium.png and /dev/null differ diff --git a/technic/textures/technic_mineral_diamond.png b/technic/textures/technic_mineral_diamond.png deleted file mode 100644 index 2d91505..0000000 Binary files a/technic/textures/technic_mineral_diamond.png and /dev/null differ diff --git a/technic/textures/technic_mineral_uranium.png b/technic/textures/technic_mineral_uranium.png deleted file mode 100644 index aad9c07..0000000 Binary files a/technic/textures/technic_mineral_uranium.png and /dev/null differ diff --git a/technic/textures/technic_mineral_zinc.png b/technic/textures/technic_mineral_zinc.png deleted file mode 100644 index 598efeb..0000000 Binary files a/technic/textures/technic_mineral_zinc.png and /dev/null differ diff --git a/technic/textures/technic_obsidian.png b/technic/textures/technic_obsidian.png deleted file mode 100644 index 5feb65c..0000000 Binary files a/technic/textures/technic_obsidian.png and /dev/null differ diff --git a/technic/textures/technic_rebar.png b/technic/textures/technic_rebar.png deleted file mode 100644 index 16d1fc5..0000000 Binary files a/technic/textures/technic_rebar.png and /dev/null differ diff --git a/technic/textures/technic_uranium.png b/technic/textures/technic_uranium.png deleted file mode 100644 index 54225f8..0000000 Binary files a/technic/textures/technic_uranium.png and /dev/null differ diff --git a/technic/textures/technic_zinc_ingot.png b/technic/textures/technic_zinc_ingot.png deleted file mode 100644 index 096ff9c..0000000 Binary files a/technic/textures/technic_zinc_ingot.png and /dev/null differ diff --git a/technic/textures/technic_zinc_lump.png b/technic/textures/technic_zinc_lump.png deleted file mode 100644 index d28a6dc..0000000 Binary files a/technic/textures/technic_zinc_lump.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_brass_ingot.png b/technic/textures/technicx32/technic_brass_ingot.png deleted file mode 100644 index 2d8b153..0000000 Binary files a/technic/textures/technicx32/technic_brass_ingot.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_chromium_ingot.png b/technic/textures/technicx32/technic_chromium_ingot.png deleted file mode 100644 index 91d5b20..0000000 Binary files a/technic/textures/technicx32/technic_chromium_ingot.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_chromium_lump.png b/technic/textures/technicx32/technic_chromium_lump.png deleted file mode 100644 index 1588f92..0000000 Binary files a/technic/textures/technicx32/technic_chromium_lump.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_concrete_block.png b/technic/textures/technicx32/technic_concrete_block.png deleted file mode 100644 index 91364f3..0000000 Binary files a/technic/textures/technicx32/technic_concrete_block.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_diamond.png b/technic/textures/technicx32/technic_diamond.png deleted file mode 100644 index 23e6126..0000000 Binary files a/technic/textures/technicx32/technic_diamond.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_diamond_block.png b/technic/textures/technicx32/technic_diamond_block.png deleted file mode 100644 index 347ed78..0000000 Binary files a/technic/textures/technicx32/technic_diamond_block.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_granite.png b/technic/textures/technicx32/technic_granite.png deleted file mode 100644 index abb1385..0000000 Binary files a/technic/textures/technicx32/technic_granite.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_marble.png b/technic/textures/technicx32/technic_marble.png deleted file mode 100644 index 846a170..0000000 Binary files a/technic/textures/technicx32/technic_marble.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_marble_bricks.png b/technic/textures/technicx32/technic_marble_bricks.png deleted file mode 100644 index 2ea1e42..0000000 Binary files a/technic/textures/technicx32/technic_marble_bricks.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_mineral_chromium.png b/technic/textures/technicx32/technic_mineral_chromium.png deleted file mode 100644 index c66f1c5..0000000 Binary files a/technic/textures/technicx32/technic_mineral_chromium.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_mineral_diamond.png b/technic/textures/technicx32/technic_mineral_diamond.png deleted file mode 100644 index 2d91505..0000000 Binary files a/technic/textures/technicx32/technic_mineral_diamond.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_mineral_uranium.png b/technic/textures/technicx32/technic_mineral_uranium.png deleted file mode 100644 index aad9c07..0000000 Binary files a/technic/textures/technicx32/technic_mineral_uranium.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_mineral_zinc.png b/technic/textures/technicx32/technic_mineral_zinc.png deleted file mode 100644 index 598efeb..0000000 Binary files a/technic/textures/technicx32/technic_mineral_zinc.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_rebar.png b/technic/textures/technicx32/technic_rebar.png deleted file mode 100644 index 16d1fc5..0000000 Binary files a/technic/textures/technicx32/technic_rebar.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_stainless_steel_ingot.png b/technic/textures/technicx32/technic_stainless_steel_ingot.png deleted file mode 100644 index 46fa296..0000000 Binary files a/technic/textures/technicx32/technic_stainless_steel_ingot.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_uranium.png b/technic/textures/technicx32/technic_uranium.png deleted file mode 100644 index 54225f8..0000000 Binary files a/technic/textures/technicx32/technic_uranium.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_zinc_ingot.png b/technic/textures/technicx32/technic_zinc_ingot.png deleted file mode 100644 index 096ff9c..0000000 Binary files a/technic/textures/technicx32/technic_zinc_ingot.png and /dev/null differ diff --git a/technic/textures/technicx32/technic_zinc_lump.png b/technic/textures/technicx32/technic_zinc_lump.png deleted file mode 100644 index d28a6dc..0000000 Binary files a/technic/textures/technicx32/technic_zinc_lump.png and /dev/null differ diff --git a/technic/textures/textures_here.txt b/technic/textures/textures_here.txt deleted file mode 100644 index 3794085..0000000 --- a/technic/textures/textures_here.txt +++ /dev/null @@ -1 +0,0 @@ -If you haven't modified the texture_path setting, you can copy textures of your texture packs into here. Folders are currently not supported. diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua new file mode 100644 index 0000000..7647c06 --- /dev/null +++ b/technic_worldgen/crafts.lua @@ -0,0 +1,49 @@ +minetest.register_craftitem( ":technic:uranium", { + description = "Uranium", + inventory_image = "technic_uranium.png", + on_place_on_ground = minetest.craftitem_place_item, +}) + +minetest.register_craftitem( ":technic:chromium_lump", { + description = "Chromium Lump", + inventory_image = "technic_chromium_lump.png", + on_place_on_ground = minetest.craftitem_place_item, +}) + +minetest.register_craftitem( ":technic:chromium_ingot", { + description = "Chromium Ingot", + inventory_image = "technic_chromium_ingot.png", + on_place_on_ground = minetest.craftitem_place_item, +}) + +minetest.register_craft({ + type = 'cooking', + output = "technic:chromium_ingot", + recipe = "technic:chromium_lump" +}) + +minetest.register_craftitem( ":technic:zinc_lump", { + description = "Zinc Lump", + inventory_image = "technic_zinc_lump.png", +}) + +minetest.register_craftitem( ":technic:zinc_ingot", { + description = "Zinc Ingot", + inventory_image = "technic_zinc_ingot.png", +}) + +minetest.register_craftitem( ":technic:stainless_steel_ingot", { + description = "Stainless Steel Ingot", + inventory_image = "technic_stainless_steel_ingot.png", +}) + +minetest.register_craftitem( ":technic:brass_ingot", { + description = "Brass Ingot", + inventory_image = "technic_brass_ingot.png", +}) + +minetest.register_craft({ + type = 'cooking', + output = "technic:zinc_ingot", + recipe = "technic:zinc_lump" +}) diff --git a/technic_worldgen/init.lua b/technic_worldgen/init.lua new file mode 100644 index 0000000..37aa386 --- /dev/null +++ b/technic_worldgen/init.lua @@ -0,0 +1,8 @@ +-- Minetest 0.4.6 : technic_worldgen + +modpath=minetest.get_modpath("technic_worldgen") + +dofile(modpath.."/nodes.lua") +dofile(modpath.."/oregen.lua") +--dofile(modpath.."/stairslike.lua") +dofile(modpath.."/crafts.lua") diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua new file mode 100644 index 0000000..5952d52 --- /dev/null +++ b/technic_worldgen/nodes.lua @@ -0,0 +1,58 @@ +minetest.register_node( ":technic:mineral_uranium", { + description = "Uranium Ore", + tiles = { "default_stone.png^technic_mineral_uranium.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + drop = 'craft "technic:uranium" 1', +}) + +minetest.register_node( ":technic:mineral_chromium", { + description = "Chromium Ore", + tiles = { "default_stone.png^technic_mineral_chromium.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + drop = 'craft "technic:chromium_lump" 1', +}) + +minetest.register_node( ":technic:mineral_zinc", { + description = "Zinc Ore", + tile_images = { "default_stone.png^technic_mineral_zinc.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), + drop = 'craft "technic:zinc_lump" 1', +}) + +minetest.register_node( ":technic:granite", { + description = "Granite", + tiles = { "technic_granite.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node( ":technic:marble", { + description = "Marble", + tiles = { "technic_marble.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node( ":technic:marble_bricks", { + description = "Marble Bricks", + tiles = { "technic_marble_bricks.png" }, + is_ground_content = true, + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_craft({ + output = 'technic:marble_bricks 4', + recipe = { + {'technic:marble','technic:marble'}, + {'technic:marble','technic:marble'} + } +}) diff --git a/technic_worldgen/oregen.lua b/technic_worldgen/oregen.lua new file mode 100644 index 0000000..ad2d5d6 --- /dev/null +++ b/technic_worldgen/oregen.lua @@ -0,0 +1,66 @@ +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_diamond", + wherein = "default:stone", + clust_scarcity = 11*11*11, + clust_num_ores = 4, + clust_size = 3, + height_min = -31000, + height_max = -450, +}) + +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_uranium", + wherein = "default:stone", + clust_scarcity = 10*10*10, + clust_num_ores = 4, + clust_size = 3, + height_min = -300, + height_max = -80, +}) +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_chromium", + wherein = "default:stone", + clust_scarcity = 10*10*10, + clust_num_ores = 2, + clust_size = 3, + height_min = -31000, + height_max = -100, +}) +minetest.register_ore({ + ore_type = "scatter", + ore = "technic:mineral_zinc", + wherein = "default:stone", + clust_scarcity = 9*9*9, + clust_num_ores = 4, + clust_size = 3, + height_min = -31000, + height_max = 2, +}) +minetest.register_ore({ + ore_type = "sheet", + ore = "technic:marble", + wherein = "default:stone", + clust_scarcity = 1, + clust_num_ores = 1, + clust_size = 3, + height_min = -150, + height_max = -50, + noise_threshhold = 0.5, + noise_params = {offset=0, scale=15, spread={x=150, y=150, z=150}, seed=23, octaves=3, persist=0.70} +}) +minetest.register_ore({ + ore_type = "sheet", + ore = "technic:granite", + wherein = "default:stone", + clust_scarcity = 1, + clust_num_ores = 1, + clust_size = 4, + height_min = -100, + height_max = -250, + noise_threshhold = 0.5, + noise_params = {offset=0, scale=15, spread={x=130, y=130, z=130}, seed=24, octaves=3, persist=0.70} +}) + diff --git a/technic_worldgen/stairslike.lua b/technic_worldgen/stairslike.lua new file mode 100644 index 0000000..038d653 --- /dev/null +++ b/technic_worldgen/stairslike.lua @@ -0,0 +1,123 @@ +-- cross-compatibility with default obsidian + +function register_technic_stairs_alias(modname, origname, newmod, newname) + minetest.register_alias(modname .. ":slab_" .. origname, newmod..":slab_" .. newname) + minetest.register_alias(modname .. ":slab_" .. origname .. "_inverted", newmod..":slab_" .. newname .. "_inverted") + minetest.register_alias(modname .. ":slab_" .. origname .. "_wall", newmod..":slab_" .. newname .. "_wall") + minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter", newmod..":slab_" .. newname .. "_quarter") + minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter_inverted", newmod..":slab_" .. newname .. "_quarter_inverted") + minetest.register_alias(modname .. ":slab_" .. origname .. "_quarter_wall", newmod..":slab_" .. newname .. "_quarter_wall") + minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter", newmod..":slab_" .. newname .. "_three_quarter") + minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter_inverted", newmod..":slab_" .. newname .. "_three_quarter_inverted") + minetest.register_alias(modname .. ":slab_" .. origname .. "_three_quarter_wall", newmod..":slab_" .. newname .. "_three_quarter_wall") + minetest.register_alias(modname .. ":stair_" .. origname, newmod..":stair_" .. newname) + minetest.register_alias(modname .. ":stair_" .. origname .. "_inverted", newmod..":stair_" .. newname .. "_inverted") + minetest.register_alias(modname .. ":stair_" .. origname .. "_wall", newmod..":stair_" .. newname .. "_wall") + minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half", newmod..":stair_" .. newname .. "_wall_half") + minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half_inverted", newmod..":stair_" .. newname .. "_wall_half_inverted") + minetest.register_alias(modname .. ":stair_" .. origname .. "_half", newmod..":stair_" .. newname .. "_half") + minetest.register_alias(modname .. ":stair_" .. origname .. "_half_inverted", newmod..":stair_" .. newname .. "_half_inverted") + minetest.register_alias(modname .. ":stair_" .. origname .. "_right_half", newmod..":stair_" .. newname .. "_right_half") + minetest.register_alias(modname .. ":stair_" .. origname .. "_right_half_inverted", newmod..":stair_" .. newname .. "_right_half_inverted") + minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half", newmod..":stair_" .. newname .. "_wall_half") + minetest.register_alias(modname .. ":stair_" .. origname .. "_wall_half_inverted", newmod..":stair_" .. newname .. "_wall_half_inverted") + minetest.register_alias(modname .. ":stair_" .. origname .. "_inner", newmod..":stair_" .. newname .. "_inner") + minetest.register_alias(modname .. ":stair_" .. origname .. "_inner_inverted", newmod..":stair_" .. newname .. "_inner_inverted") + minetest.register_alias(modname .. ":stair_" .. origname .. "_outer", newmod..":stair_" .. newname .. "_outer") + minetest.register_alias(modname .. ":stair_" .. origname .. "_outer_inverted", newmod..":stair_" .. newname .. "_outer_inverted") + minetest.register_alias(modname .. ":panel_" .. origname .. "_bottom", newmod..":panel_" .. newname .. "_bottom") + minetest.register_alias(modname .. ":panel_" .. origname .. "_top", newmod..":panel_" .. newname .. "_top") + minetest.register_alias(modname .. ":panel_" .. origname .. "_vertical", newmod..":panel_" .. newname .. "_vertical") + minetest.register_alias(modname .. ":micro_" .. origname .. "_bottom", newmod..":micro_" .. newname .. "_bottom") + minetest.register_alias(modname .. ":micro_" .. origname .. "_top", newmod..":micro_" .. newname .. "_top") +end + +minetest.register_alias("technic:obsidian", "default:obsidian") +minetest.register_alias("moreblocks:obsidian", "default:obsidian") + +register_stair_slab_panel_micro( + ":default", + "obsidian", + "default:obsidian", + {cracky=3, not_in_creative_inventory=1}, + {"default_obsidian.png"}, + "Obsidian", + "default:obsidian", + "none", + light +) + +register_technic_stairs_alias("moreblocks", "obsidian", "default", "obsidian") +table.insert(circular_saw.known_stairs, "default:obsidian") + +-- other stairs/slabs + +if type(register_stair_and_slab_and_panel_and_micro) == "function" then +register_stair_and_slab_and_panel_and_micro(":stairsplus", "marble", "technic:marble", + {cracky=3, not_in_creative_inventory=1}, + {"technic_marble.png"}, + "Marble Stairs", + "Marble Slab", + "Marble Panel", + "Marble Microblock", + "marble") +register_stair_and_slab_and_panel_and_micro(":stairsplus", "marble_bricks", "technic:marble_bricks", + {cracky=3, not_in_creative_inventory=1}, + {"technic_marble_bricks.png"}, + "Marble Bricks Stairs", + "Marble Bricks Slab", + "Marble Bricks Panel", + "Marble Bricks Microblock", + "marble_bricks") +register_stair_and_slab_and_panel_and_micro(":stairsplus", "granite", "technic:granite", + {cracky=3, not_in_creative_inventory=1}, + {"technic_granite.png"}, + "Granite Stairs", + "Granite Slab", + "Granite Panel", + "Granite Microblock", + "granite") +register_stair_and_slab_and_panel_and_micro(":stairsplus", "obsidian", "default:obsidian", + {cracky=3, not_in_creative_inventory=1}, + {"default_obsidian.png"}, + "Obsidian Stairs", + "Obsidian Slab", + "Obsidian Panel", + "Obsidian Microblock", + "obsidian") +end + +if type(register_stair_slab_panel_micro) == "function" then +register_stair_slab_panel_micro(":stairsplus", "marble", "technic:marble", + {cracky=3, not_in_creative_inventory=1}, + {"technic_marble.png"}, + "Marble Stairs", + "Marble Slab", + "Marble Panel", + "Marble Microblock", + "marble") +register_stair_slab_panel_micro(":stairsplus", "marble_bricks", "technic:marble_bricks", + {cracky=3, not_in_creative_inventory=1}, + {"technic_marble_bricks.png"}, + "Marble Bricks Stairs", + "Marble Bricks Slab", + "Marble Bricks Panel", + "Marble Bricks Microblock", + "marble_bricks") +register_stair_slab_panel_micro(":stairsplus", "granite", "technic:granite", + {cracky=3, not_in_creative_inventory=1}, + {"technic_granite.png"}, + "Granite Stairs", + "Granite Slab", + "Granite Panel", + "Granite Microblock", + "granite") +register_stair_slab_panel_micro(":stairsplus", "obsidian", "technic:obsidian", + {cracky=3, not_in_creative_inventory=1}, + {"technic_obsidian.png"}, + "Obsidian Stairs", + "Obsidian Slab", + "Obsidian Panel", + "Obsidian Microblock", + "obsidian") +end diff --git a/unified_inventory/depends.txt b/unified_inventory/depends.txt index 4be0815..8b79558 100644 --- a/unified_inventory/depends.txt +++ b/unified_inventory/depends.txt @@ -1 +1,2 @@ aaa_recipeshook +creative diff --git a/unified_inventory/init.lua b/unified_inventory/init.lua index 80855b3..cc170a0 100644 --- a/unified_inventory/init.lua +++ b/unified_inventory/init.lua @@ -1,4 +1,11 @@ --- load api -dofile(minetest.get_modpath("unified_inventory").."/api.lua") +-- Unified Inventory mod 0.4.6 + +-- disable default creative inventory +if creative_inventory then + creative_inventory.set_creative_formspec = function(player, start_i, pagenum) + return + end +end +dofile(minetest.get_modpath("unified_inventory").."/api.lua") dofile(minetest.get_modpath("unified_inventory").."/bags.lua")