From 5f005928cb7150ea764b2aebc252b63e5d974576 Mon Sep 17 00:00:00 2001 From: OgelGames Date: Tue, 8 Aug 2023 00:14:11 +1000 Subject: [PATCH] Merge concrete into `technic_worldgen` and `extranodes` (#322) --- concrete/init.lua | 132 ------------------ concrete/locale/concrete.de.tr | 12 -- concrete/locale/concrete.es.tr | 10 -- concrete/locale/concrete.fr.tr | 9 -- concrete/locale/concrete.ja.tr | 11 -- concrete/locale/concrete.pl.tr | 12 -- concrete/locale/concrete.pt_BR.tr | 12 -- concrete/locale/concrete.tr.tr | 9 -- concrete/locale/concrete.zh_CN.tr | 7 - concrete/locale/template.txt | 10 -- concrete/mod.conf | 3 - extranodes/init.lua | 101 +++++++++++++- extranodes/locale/extranodes.de.tr | 4 +- extranodes/locale/extranodes.es.tr | 4 +- extranodes/locale/extranodes.fr.tr | 4 +- extranodes/locale/extranodes.ja.tr | 10 ++ extranodes/locale/extranodes.pl.tr | 4 +- extranodes/locale/extranodes.pt_BR.tr | 4 +- extranodes/locale/extranodes.tr.tr | 3 + extranodes/locale/extranodes.zh_CN.tr | 3 + extranodes/locale/template.txt | 4 +- extranodes/mod.conf | 2 +- technic_worldgen/crafts.lua | 11 +- technic_worldgen/init.lua | 3 - .../locale/technic_worldgen.de.tr | 1 + .../locale/technic_worldgen.es.tr | 1 + .../locale/technic_worldgen.fr.tr | 1 + .../locale/technic_worldgen.ja.tr | 48 +++++++ .../locale/technic_worldgen.pl.tr | 1 + .../locale/technic_worldgen.pt_BR.tr | 1 + .../locale/technic_worldgen.tr.tr | 1 + .../locale/technic_worldgen.zh_CN.tr | 1 + technic_worldgen/locale/template.txt | 1 + technic_worldgen/nodes.lua | 15 +- technic_worldgen/overrides.lua | 2 +- technic_worldgen/rubber.lua | 2 +- ...technic_blast_resistant_concrete_block.png | Bin 37 files changed, 217 insertions(+), 242 deletions(-) delete mode 100644 concrete/init.lua delete mode 100644 concrete/locale/concrete.de.tr delete mode 100644 concrete/locale/concrete.es.tr delete mode 100644 concrete/locale/concrete.fr.tr delete mode 100644 concrete/locale/concrete.ja.tr delete mode 100644 concrete/locale/concrete.pl.tr delete mode 100644 concrete/locale/concrete.pt_BR.tr delete mode 100644 concrete/locale/concrete.tr.tr delete mode 100644 concrete/locale/concrete.zh_CN.tr delete mode 100644 concrete/locale/template.txt delete mode 100644 concrete/mod.conf create mode 100644 technic_worldgen/locale/technic_worldgen.ja.tr rename {concrete => technic_worldgen}/textures/technic_blast_resistant_concrete_block.png (100%) diff --git a/concrete/init.lua b/concrete/init.lua deleted file mode 100644 index f0a75d62..00000000 --- a/concrete/init.lua +++ /dev/null @@ -1,132 +0,0 @@ ---Minetest 0.4.7 mod: concrete ---(c) 2013 by RealBadAngel - -local technic = rawget(_G, "technic") or {} -technic.concrete_posts = {} - -local S = minetest.get_translator(minetest.get_current_modname()) - -for i = 0, 31 do - minetest.register_alias("technic:concrete_post"..i, - "technic:concrete_post") -end -for i = 32, 63 do - minetest.register_alias("technic:concrete_post"..i, - "technic:concrete_post_with_platform") -end - -minetest.register_craft({ - output = 'technic:concrete_post_platform 6', - recipe = { - {'technic:concrete','technic:concrete_post','technic:concrete'}, - } -}) - -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'}, - } -}) - -minetest.register_craft({ - output = 'technic:blast_resistant_concrete 5', - recipe = { - {'technic:concrete','technic:composite_plate','technic:concrete'}, - {'technic:composite_plate','technic:concrete','technic:composite_plate'}, - {'technic:concrete','technic:composite_plate','technic:concrete'}, - } -}) - -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(), - on_blast = function(pos, intensity) - if intensity > 9 then - minetest.remove_node(pos) - return {"technic:blast_resistant_concrete"} - end - end, -}) - -if minetest.get_modpath("moreblocks") then - stairsplus:register_all("technic","blast_resistant_concrete","technic:blast_resistant_concrete",{ - description = "Blast-resistant Concrete", - tiles = {"technic_blast_resistant_concrete_block.png",}, - groups = {cracky=1, level=3, concrete=1}, - sounds = default.node_sound_stone_defaults(), - on_blast = function(pos, intensity) - if intensity > 1 then - minetest.remove_node(pos) - minetest.add_item(pos, "technic:blast_resistant_concrete") - end - end, - }) -end - -local box_platform = {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5} -local box_post = {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15} -local box_front = {-0.1, -0.3, -0.5, 0.1, 0.3, 0} -local box_back = {-0.1, -0.3, 0, 0.1, 0.3, 0.5} -local box_left = {-0.5, -0.3, -0.1, 0, 0.3, 0.1} -local box_right = {0, -0.3, -0.1, 0.5, 0.3, 0.1} - -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(), - paramtype = "light", - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = {box_platform} - }, - on_place = function (itemstack, placer, pointed_thing) - local node = minetest.get_node(pointed_thing.under) - if node.name ~= "technic:concrete_post" then - return minetest.item_place_node(itemstack, placer, pointed_thing) - end - minetest.set_node(pointed_thing.under, {name="technic:concrete_post_with_platform"}) - itemstack:take_item() - placer:set_wielded_item(itemstack) - return itemstack - end, -}) - -for platform = 0, 1 do - local after_dig_node = nil - if platform == 1 then - after_dig_node = function(pos, old_node) - old_node.name = "technic:concrete_post" - minetest.set_node(pos, old_node) - end - end - - minetest.register_node(":technic:concrete_post"..(platform == 1 and "_with_platform" or ""), { - 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(), - drop = (platform == 1 and "technic:concrete_post_platform" or - "technic:concrete_post"), - paramtype = "light", - sunlight_propagates = true, - drawtype = "nodebox", - connects_to = {"group:concrete", "group:concrete_post"}, - node_box = { - type = "connected", - fixed = {box_post, (platform == 1 and box_platform or nil)}, - connect_front = box_front, - connect_back = box_back, - connect_left = box_left, - connect_right = box_right, - }, - after_dig_node = after_dig_node, - }) -end - diff --git a/concrete/locale/concrete.de.tr b/concrete/locale/concrete.de.tr deleted file mode 100644 index 1028bf82..00000000 --- a/concrete/locale/concrete.de.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: concrete - -# German Translation for technic_concrete -# Deutsche Übersetzung von technic_concrete -# by Xanthin - -Rebar=Bewehrungsstab -Concrete Block=Betonblock -Blast-resistant Concrete Block=Explosionsbestaendiger Betonblock -Concrete Post Platform=Betonpfostenplattform -Concrete Post=Betonpfosten - diff --git a/concrete/locale/concrete.es.tr b/concrete/locale/concrete.es.tr deleted file mode 100644 index d096a066..00000000 --- a/concrete/locale/concrete.es.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: concrete - -# technic_concrete traducido por Carlos Barraza - -Rebar=Barra de refuerzo -Concrete Block=Bloque de concreto -Blast-resistant Concrete Block=Bloque de concreto resistente a explosiones -Concrete Post Platform=Plataforma de concreto -Concrete Post=Postes de concreto - diff --git a/concrete/locale/concrete.fr.tr b/concrete/locale/concrete.fr.tr deleted file mode 100644 index be5c3db5..00000000 --- a/concrete/locale/concrete.fr.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: concrete - -# technic_concrete translation template - -Rebar=Armature -Concrete Block=Bloc de béton -Blast-resistant Concrete Block=Bloc de béton anti explosions -Concrete Post Platform=Plateforme en béton -Concrete Post=Pilier en béton diff --git a/concrete/locale/concrete.ja.tr b/concrete/locale/concrete.ja.tr deleted file mode 100644 index 857f69cb..00000000 --- a/concrete/locale/concrete.ja.tr +++ /dev/null @@ -1,11 +0,0 @@ -# textdomain: concrete - -# technic_concrete japanese translation -# technic_concreteの日本語への翻訳 -# by damiemk - -Rebar=鉄筋 -Concrete Block=コンクリートのブロック -Blast-resistant Concrete Block=耐爆性コンクリートのブロック -Concrete Post Platform=コンクリートのプラットフォーム -Concrete Post=コンクリートポスト diff --git a/concrete/locale/concrete.pl.tr b/concrete/locale/concrete.pl.tr deleted file mode 100644 index c322393c..00000000 --- a/concrete/locale/concrete.pl.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: concrete - -# Polish Translation for technic_concrete -# Polskie tłumaczenie technic_concrete -# by mat9117 - -Rebar=Pręt zbrojeniowy -Concrete Block=Blok betonu -Blast-resistant Concrete Block=Przeciwwybuchowy blok betonu -Concrete Post Platform=Betonowa platforma -Concrete Post=Betonowy słup - diff --git a/concrete/locale/concrete.pt_BR.tr b/concrete/locale/concrete.pt_BR.tr deleted file mode 100644 index e8813cfd..00000000 --- a/concrete/locale/concrete.pt_BR.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: concrete - -# Braziliam portuguese translation for technic_concrete -# Tradução portuguesa brasileira para technic_concrete -# By Sires - -Rebar=Vergalhão -Concrete Block=Bloco de Concreto -Blast-resistant Concrete Block=Bloco de Concreto resistente-a-explosões -Concrete Post Platform=Plataforma para Poste de Concreto -Concrete Post=Poste de Concreto - diff --git a/concrete/locale/concrete.tr.tr b/concrete/locale/concrete.tr.tr deleted file mode 100644 index 24fdd862..00000000 --- a/concrete/locale/concrete.tr.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: concrete - -# turkish translation by mahmutelmas06 - -Rebar=Beton demiri -Concrete Block=Beton blok -Blast-resistant Concrete Block=Patlamaya dayanıklı beton blok -Concrete Post Platform=Beton direk platformu -Concrete Post=Beton direk diff --git a/concrete/locale/concrete.zh_CN.tr b/concrete/locale/concrete.zh_CN.tr deleted file mode 100644 index ecfbcac5..00000000 --- a/concrete/locale/concrete.zh_CN.tr +++ /dev/null @@ -1,7 +0,0 @@ -# textdomain: concrete - -Rebar=钢筋 -Concrete Block=混凝土块 -Blast-resistant Concrete Block=抗爆混凝土块 -Concrete Post Platform=混凝土柱平台 -Concrete Post=混凝土柱 diff --git a/concrete/locale/template.txt b/concrete/locale/template.txt deleted file mode 100644 index 8b2200bc..00000000 --- a/concrete/locale/template.txt +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: concrete - -# technic_concrete translation template - -Rebar= -Concrete Block= -Blast-resistant Concrete Block= -Concrete Post Platform= -Concrete Post= - diff --git a/concrete/mod.conf b/concrete/mod.conf deleted file mode 100644 index 4e4e0782..00000000 --- a/concrete/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = concrete -depends = default, basic_materials, technic -optional_depends = moreblocks diff --git a/extranodes/init.lua b/extranodes/init.lua index ac69b7e5..a59fc2ea 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -32,7 +32,7 @@ if minetest.get_modpath("moreblocks") then tiles={"technic_granite_bricks.png"}, }) - stairsplus:register_all("technic", "concrete", "technic:concrete", { + stairsplus:register_all("technic", "concrete", "basic_materials:concrete_block", { description=S("Concrete"), groups={cracky=3, not_in_creative_inventory=1}, tiles={"basic_materials_concrete_block.png"}, @@ -62,6 +62,18 @@ if minetest.get_modpath("moreblocks") then tiles={"technic_stainless_steel_block.png"}, }) + stairsplus:register_all("technic", "blast_resistant_concrete", "technic:blast_resistant_concrete", { + description = S("Blast-resistant Concrete"), + tiles = {"technic_blast_resistant_concrete_block.png",}, + groups = {cracky = 1, level = 3, concrete = 1}, + on_blast = function(pos, intensity) + if intensity > 3 then + minetest.remove_node(pos) + minetest.add_item(pos, "technic:blast_resistant_concrete") + end + end + }) + -- FIXME: Clean this function up somehow local function register_technic_stairs_alias(modname, origname, newmod, newname) minetest.register_alias(modname .. ":slab_" .. origname, newmod..":slab_" .. newname) @@ -334,3 +346,90 @@ if minetest.get_modpath("unifieddyes") then }) end end + +for i = 0, 31 do + minetest.register_alias("technic:concrete_post"..i, + "technic:concrete_post") +end +for i = 32, 63 do + minetest.register_alias("technic:concrete_post"..i, + "technic:concrete_post_with_platform") +end + +minetest.register_craft({ + output = 'technic:concrete_post_platform 6', + recipe = { + {'basic_materials:concrete_block','technic:concrete_post','basic_materials:concrete_block'}, + } +}) + +minetest.register_craft({ + output = 'technic:concrete_post 12', + recipe = { + {'basic_materials:concrete_block','basic_materials:steel_bar','basic_materials:concrete_block'}, + {'basic_materials:concrete_block','basic_materials:steel_bar','basic_materials:concrete_block'}, + {'basic_materials:concrete_block','basic_materials:steel_bar','basic_materials:concrete_block'}, + } +}) + +local box_platform = {-0.5, 0.3, -0.5, 0.5, 0.5, 0.5} +local box_post = {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15} +local box_front = {-0.1, -0.3, -0.5, 0.1, 0.3, 0} +local box_back = {-0.1, -0.3, 0, 0.1, 0.3, 0.5} +local box_left = {-0.5, -0.3, -0.1, 0, 0.3, 0.1} +local box_right = {0, -0.3, -0.1, 0.5, 0.3, 0.1} + +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(), + paramtype = "light", + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = {box_platform} + }, + on_place = function (itemstack, placer, pointed_thing) + local node = minetest.get_node(pointed_thing.under) + if node.name ~= "technic:concrete_post" then + return minetest.item_place_node(itemstack, placer, pointed_thing) + end + minetest.set_node(pointed_thing.under, {name="technic:concrete_post_with_platform"}) + itemstack:take_item() + placer:set_wielded_item(itemstack) + return itemstack + end, +}) + +for platform = 0, 1 do + local after_dig_node = nil + if platform == 1 then + after_dig_node = function(pos, old_node) + old_node.name = "technic:concrete_post" + minetest.set_node(pos, old_node) + end + end + + minetest.register_node(":technic:concrete_post"..(platform == 1 and "_with_platform" or ""), { + 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(), + drop = (platform == 1 and "technic:concrete_post_platform" or + "technic:concrete_post"), + paramtype = "light", + sunlight_propagates = true, + drawtype = "nodebox", + connects_to = {"group:concrete", "group:concrete_post"}, + node_box = { + type = "connected", + fixed = {box_post, (platform == 1 and box_platform or nil)}, + connect_front = box_front, + connect_back = box_back, + connect_left = box_left, + connect_right = box_right, + }, + after_dig_node = after_dig_node, + }) +end diff --git a/extranodes/locale/extranodes.de.tr b/extranodes/locale/extranodes.de.tr index 23218842..58e035fd 100644 --- a/extranodes/locale/extranodes.de.tr +++ b/extranodes/locale/extranodes.de.tr @@ -8,7 +8,7 @@ Marble=Marmor Marble Bricks=Marmorziegel Granite=Granit Concrete=Beton - +Blast-resistant Concrete= Granite Bricks= Zinc Block= Cast Iron Block= @@ -16,3 +16,5 @@ Carbon Steel Block= Stainless Steel Block= Insulator/cable clip= Steel strut with insulator/cable clip= +Concrete Post Platform=Betonpfostenplattform +Concrete Post=Betonpfosten diff --git a/extranodes/locale/extranodes.es.tr b/extranodes/locale/extranodes.es.tr index f27fd4fb..27f630cf 100644 --- a/extranodes/locale/extranodes.es.tr +++ b/extranodes/locale/extranodes.es.tr @@ -6,7 +6,7 @@ Marble=Mármol Marble Bricks=Ladrillos de mármol Granite=Granito Concrete=Concreto - +Blast-resistant Concrete= Granite Bricks= Zinc Block= Cast Iron Block= @@ -14,3 +14,5 @@ Carbon Steel Block= Stainless Steel Block= Insulator/cable clip= Steel strut with insulator/cable clip= +Concrete Post Platform=Plataforma de concreto +Concrete Post=Postes de concreto diff --git a/extranodes/locale/extranodes.fr.tr b/extranodes/locale/extranodes.fr.tr index f1db5766..792b7212 100644 --- a/extranodes/locale/extranodes.fr.tr +++ b/extranodes/locale/extranodes.fr.tr @@ -6,7 +6,7 @@ Marble=Marbre Marble Bricks=Briques en marbre Granite=Granite Concrete=Béton - +Blast-resistant Concrete= Granite Bricks=Briques en granite Zinc Block=Bloc de zinc Cast Iron Block=Bloc de fonte @@ -14,3 +14,5 @@ Carbon Steel Block=Bloc d'acier Stainless Steel Block=Bloc en acier inoxydable Insulator/cable clip=Isolateur Steel strut with insulator/cable clip=Isolateur avec support en acier +Concrete Post Platform=Plateforme en béton +Concrete Post=Pilier en béton diff --git a/extranodes/locale/extranodes.ja.tr b/extranodes/locale/extranodes.ja.tr index 40459abf..a9572a0e 100644 --- a/extranodes/locale/extranodes.ja.tr +++ b/extranodes/locale/extranodes.ja.tr @@ -8,3 +8,13 @@ Marble=大理石 Marble Bricks=大理石のレンガ Granite=花崗岩 Concrete=コンクリート +Blast-resistant Concrete= +Granite Bricks= +Zinc Block= +Cast Iron Block= +Carbon Steel Block= +Stainless Steel Block= +Insulator/cable clip= +Steel strut with insulator/cable clip= +Concrete Post Platform=コンクリートのプラットフォーム +Concrete Post=コンクリートポスト diff --git a/extranodes/locale/extranodes.pl.tr b/extranodes/locale/extranodes.pl.tr index b0d993e4..1439dc7a 100644 --- a/extranodes/locale/extranodes.pl.tr +++ b/extranodes/locale/extranodes.pl.tr @@ -8,7 +8,7 @@ Marble=Marmur Marble Bricks=Marmurowe cegły Granite=Granit Concrete=Beton - +Blast-resistant Concrete= Granite Bricks= Zinc Block= Cast Iron Block= @@ -16,3 +16,5 @@ Carbon Steel Block= Stainless Steel Block= Insulator/cable clip= Steel strut with insulator/cable clip= +Concrete Post Platform=Betonowa platforma +Concrete Post=Betonowy słup diff --git a/extranodes/locale/extranodes.pt_BR.tr b/extranodes/locale/extranodes.pt_BR.tr index 343dd1e7..57e79f75 100644 --- a/extranodes/locale/extranodes.pt_BR.tr +++ b/extranodes/locale/extranodes.pt_BR.tr @@ -8,7 +8,7 @@ Marble=Mármore Marble Bricks=Tijolos de Mármore Granite=Granito Concrete=Concreto - +Blast-resistant Concrete= Granite Bricks= Zinc Block= Cast Iron Block= @@ -16,3 +16,5 @@ Carbon Steel Block= Stainless Steel Block= Insulator/cable clip= Steel strut with insulator/cable clip= +Concrete Post Platform=Plataforma para Poste de Concreto +Concrete Post=Poste de Concreto diff --git a/extranodes/locale/extranodes.tr.tr b/extranodes/locale/extranodes.tr.tr index 5dfb4f48..bb969248 100644 --- a/extranodes/locale/extranodes.tr.tr +++ b/extranodes/locale/extranodes.tr.tr @@ -6,6 +6,7 @@ Marble=Mermer Marble Bricks=Mermer tuğla Granite=Granit Concrete=Beton +Blast-resistant Concrete= Granite Bricks= Zinc Block= Cast Iron Block= @@ -13,3 +14,5 @@ Carbon Steel Block= Stainless Steel Block= Insulator/cable clip= Steel strut with insulator/cable clip= +Concrete Post Platform=Beton direk platformu +Concrete Post=Beton direk diff --git a/extranodes/locale/extranodes.zh_CN.tr b/extranodes/locale/extranodes.zh_CN.tr index 2f0c4bb5..782c0c24 100644 --- a/extranodes/locale/extranodes.zh_CN.tr +++ b/extranodes/locale/extranodes.zh_CN.tr @@ -4,6 +4,7 @@ Marble=大理石 Marble Bricks=大理石砖 Granite=花岗岩 Concrete=混凝土 +Blast-resistant Concrete= Granite Bricks= Zinc Block= Cast Iron Block= @@ -11,3 +12,5 @@ Carbon Steel Block= Stainless Steel Block= Insulator/cable clip= Steel strut with insulator/cable clip= +Concrete Post Platform=混凝土柱平台 +Concrete Post=混凝土柱 diff --git a/extranodes/locale/template.txt b/extranodes/locale/template.txt index d5a9988e..77c862e1 100644 --- a/extranodes/locale/template.txt +++ b/extranodes/locale/template.txt @@ -6,7 +6,7 @@ Marble= Marble Bricks= Granite= Concrete= - +Blast-resistant Concrete= Granite Bricks= Zinc Block= Cast Iron Block= @@ -14,3 +14,5 @@ Carbon Steel Block= Stainless Steel Block= Insulator/cable clip= Steel strut with insulator/cable clip= +Concrete Post Platform= +Concrete Post= diff --git a/extranodes/mod.conf b/extranodes/mod.conf index e340ba85..f452735d 100644 --- a/extranodes/mod.conf +++ b/extranodes/mod.conf @@ -1,3 +1,3 @@ name = extranodes -depends = default, technic_worldgen, basic_materials, concrete +depends = default, technic_worldgen, basic_materials optional_depends = unifieddyes, moreblocks, steel, streetsmod diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua index 365267ea..9482deba 100644 --- a/technic_worldgen/crafts.lua +++ b/technic_worldgen/crafts.lua @@ -1,5 +1,5 @@ -local S = technic.worldgen.gettext +local S = minetest.get_translator("technic_worldgen") minetest.register_craftitem(":technic:uranium_lump", { description = S("Uranium Lump"), @@ -151,3 +151,12 @@ minetest.register_craft({ {"technic:granite","technic:granite"} } }) + +minetest.register_craft({ + output = "technic:blast_resistant_concrete 5", + recipe = { + {"basic_materials:concrete_block", "technic:composite_plate", "basic_materials:concrete_block"}, + {"technic:composite_plate", "basic_materials:concrete_block", "technic:composite_plate"}, + {"basic_materials:concrete_block", "technic:composite_plate", "basic_materials:concrete_block"}, + } +}) diff --git a/technic_worldgen/init.lua b/technic_worldgen/init.lua index a8100a7e..1ef40bf0 100644 --- a/technic_worldgen/init.lua +++ b/technic_worldgen/init.lua @@ -2,9 +2,6 @@ local modpath = minetest.get_modpath("technic_worldgen") technic = rawget(_G, "technic") or {} -technic.worldgen = { - gettext = minetest.get_translator(minetest.get_current_modname()) -} dofile(modpath.."/config.lua") dofile(modpath.."/nodes.lua") diff --git a/technic_worldgen/locale/technic_worldgen.de.tr b/technic_worldgen/locale/technic_worldgen.de.tr index 5e695507..29e2ed16 100644 --- a/technic_worldgen/locale/technic_worldgen.de.tr +++ b/technic_worldgen/locale/technic_worldgen.de.tr @@ -34,6 +34,7 @@ Carbon Steel Block=Kohlenstoffstahlblock Stainless Steel Block=Edelstahlblock Brass Block=Messingblock Wrought Iron=Schmiedeeisen +Blast-resistant Concrete Block=Explosionsbestaendiger Betonblock ## rubber.lua Rubber Tree Sapling=Gummibaumsetzling diff --git a/technic_worldgen/locale/technic_worldgen.es.tr b/technic_worldgen/locale/technic_worldgen.es.tr index 0cf93b61..26dc3e22 100644 --- a/technic_worldgen/locale/technic_worldgen.es.tr +++ b/technic_worldgen/locale/technic_worldgen.es.tr @@ -32,6 +32,7 @@ Carbon Steel Block=Bloque de Acero al Carbon Stainless Steel Block=Bloque de Acero Inoxidable Brass Block=Bloque de Latón Wrought Iron=Hierro Forjado +Blast-resistant Concrete Block=Bloque de concreto resistente a explosiones ###rubber.lua Rubber Tree Sapling=Retoño de Árbol de Goma diff --git a/technic_worldgen/locale/technic_worldgen.fr.tr b/technic_worldgen/locale/technic_worldgen.fr.tr index 124b1156..bdf004b6 100644 --- a/technic_worldgen/locale/technic_worldgen.fr.tr +++ b/technic_worldgen/locale/technic_worldgen.fr.tr @@ -33,6 +33,7 @@ Carbon Steel Block=Bloc d'acier au carbone Stainless Steel Block=Bloc d'acier inoxydable Brass Block=Bloc de laiton Wrought Iron=Fer forgé +Blast-resistant Concrete Block=Bloc de béton anti explosions ###rubber.lua Rubber Tree Sapling=Pousse d'arbre à caoutchouc diff --git a/technic_worldgen/locale/technic_worldgen.ja.tr b/technic_worldgen/locale/technic_worldgen.ja.tr new file mode 100644 index 00000000..26c744be --- /dev/null +++ b/technic_worldgen/locale/technic_worldgen.ja.tr @@ -0,0 +1,48 @@ +# textdomain: technic_worldgen + +# technic_worldgen japanese translation + +###crafts.lua +Uranium Lump= +Uranium Ingot= +Chromium Lump= +Chromium Ingot= +Zinc Lump= +Zinc Ingot= +Brass Ingot= +Wrought Iron Ingot= +Cast Iron Ingot= +Carbon Steel Ingot= +Stainless Steel Ingot= +Iron= + +###nodes.lua +Uranium Ore= +Chromium Ore= +Zinc Ore= +Granite= +Marble= +Marble Bricks= +Uranium Block= +Chromium Block= +Zinc Block= +Wrought Iron Block= +Cast Iron Block= +Carbon Steel Block= +Stainless Steel Block= +Brass Block= +Wrought Iron= +Blast-resistant Concrete Block=耐爆性コンクリートのブロック + +###rubber.lua +Rubber Tree Sapling= +Rubber Tree= +Lead Lump= +Lead Ingot= +Sulfur Lump= +Rubber Tree Leaves= +Lead Ore= +Sulfur Ore= +Granite Bricks= +Lead Block= +Sulfur Block= diff --git a/technic_worldgen/locale/technic_worldgen.pl.tr b/technic_worldgen/locale/technic_worldgen.pl.tr index 03807e3d..391ac3c9 100644 --- a/technic_worldgen/locale/technic_worldgen.pl.tr +++ b/technic_worldgen/locale/technic_worldgen.pl.tr @@ -34,6 +34,7 @@ Carbon Steel Block=Blok stali węglowej Stainless Steel Block=Blok stali nierdzewnej Brass Block=Blok mosiądzu Wrought Iron=Kute żelazo +Blast-resistant Concrete Block=Przeciwwybuchowy blok betonu ###rubber.lua Rubber Tree Sapling=Sadzonka kauczukowca diff --git a/technic_worldgen/locale/technic_worldgen.pt_BR.tr b/technic_worldgen/locale/technic_worldgen.pt_BR.tr index 48767e1e..eaaacab6 100644 --- a/technic_worldgen/locale/technic_worldgen.pt_BR.tr +++ b/technic_worldgen/locale/technic_worldgen.pt_BR.tr @@ -34,6 +34,7 @@ Carbon Steel Block=Bloco de Aço Carbono Stainless Steel Block=Bloco de Aço Inoxidável Brass Block=Bloco de Latão Wrought Iron=Ferro Forjado +Blast-resistant Concrete Block=Bloco de Concreto resistente-a-explosões ###rubber.lua Rubber Tree Sapling=Muda de Árvore de Borracha diff --git a/technic_worldgen/locale/technic_worldgen.tr.tr b/technic_worldgen/locale/technic_worldgen.tr.tr index 25e702ce..55c24e75 100644 --- a/technic_worldgen/locale/technic_worldgen.tr.tr +++ b/technic_worldgen/locale/technic_worldgen.tr.tr @@ -34,6 +34,7 @@ Carbon Steel Block=Karbon çelik blok Stainless Steel Block=Paslanmaz çelik blok Brass Block=Pirinç blok Wrought Iron=İşlenmiş demir +Blast-resistant Concrete Block=Patlamaya dayanıklı beton blok ###rubber.lua Rubber Tree Sapling=Kauçuk ağacı fidanı diff --git a/technic_worldgen/locale/technic_worldgen.zh_CN.tr b/technic_worldgen/locale/technic_worldgen.zh_CN.tr index 793cba1d..15c9e31a 100644 --- a/technic_worldgen/locale/technic_worldgen.zh_CN.tr +++ b/technic_worldgen/locale/technic_worldgen.zh_CN.tr @@ -39,3 +39,4 @@ Sulfur Ore= Granite Bricks= Lead Block= Sulfur Block= +Blast-resistant Concrete Block=抗爆混凝土块 diff --git a/technic_worldgen/locale/template.txt b/technic_worldgen/locale/template.txt index 0b1ea849..d9d6d9e9 100644 --- a/technic_worldgen/locale/template.txt +++ b/technic_worldgen/locale/template.txt @@ -33,6 +33,7 @@ Carbon Steel Block= Stainless Steel Block= Brass Block= Wrought Iron= +Blast-resistant Concrete Block= ###rubber.lua Rubber Tree Sapling= diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua index 493c1356..db0d38bf 100644 --- a/technic_worldgen/nodes.lua +++ b/technic_worldgen/nodes.lua @@ -1,5 +1,5 @@ -local S = technic.worldgen.gettext +local S = minetest.get_translator("technic_worldgen") minetest.register_node(":technic:mineral_uranium", { description = S("Uranium Ore"), @@ -141,3 +141,16 @@ minetest.register_node(":technic:sulfur_block", { groups = {cracky = 3}, sounds = default.node_sound_stone_defaults() }) + +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(), + on_blast = function(pos, intensity) + if intensity > 9 then + minetest.remove_node(pos) + return {"technic:blast_resistant_concrete"} + end + end +}) diff --git a/technic_worldgen/overrides.lua b/technic_worldgen/overrides.lua index 9ac233fa..b6a942d8 100644 --- a/technic_worldgen/overrides.lua +++ b/technic_worldgen/overrides.lua @@ -1,5 +1,5 @@ -local S = technic.worldgen.gettext +local S = minetest.get_translator("technic_worldgen") minetest.override_item("default:steel_ingot", { description = S("Wrought Iron Ingot"), diff --git a/technic_worldgen/rubber.lua b/technic_worldgen/rubber.lua index 11da9ca8..58adae5a 100644 --- a/technic_worldgen/rubber.lua +++ b/technic_worldgen/rubber.lua @@ -1,6 +1,6 @@ -- Code of rubber tree by PilzAdam -local S = technic.worldgen.gettext +local S = minetest.get_translator("technic_worldgen") minetest.register_node(":moretrees:rubber_tree_sapling", { description = S("Rubber Tree Sapling"), diff --git a/concrete/textures/technic_blast_resistant_concrete_block.png b/technic_worldgen/textures/technic_blast_resistant_concrete_block.png similarity index 100% rename from concrete/textures/technic_blast_resistant_concrete_block.png rename to technic_worldgen/textures/technic_blast_resistant_concrete_block.png