Browse Source

conform code to upstream spacing and order

keep missed local changes for resubmission
master
poikilos 5 years ago
committed by Jacob Gustafson
parent
commit
fdadcec3a9
  1. 45
      patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/init.lua

45
patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/init.lua

@ -152,14 +152,13 @@ minetest.register_ore({
-- =================================================================== -- ===================================================================
-- Bismuth (formerly Alexandrite) -- Bismuth (formerly Alexandrite)
minetest.register_alias("nftools:alexandrite_ore", "nftools:stone_with_bismuth")
minetest.register_alias("nftools:alexandrite", "nftools:bismuth")
minetest.register_craftitem ("nftools:bismuth", { minetest.register_craftitem ("nftools:bismuth", {
description = "Bismuth", description = "Bismuth",
inventory_image = "nftools_bismuth.png", inventory_image = "nftools_bismuth.png",
}) })
minetest.register_alias ("nftools:alexandrite", "nftools:bismuth")
minetest.register_node ("nftools:stone_with_bismuth", { minetest.register_node ("nftools:stone_with_bismuth", {
description = "Raw Bismuth", description = "Raw Bismuth",
tiles = {"default_stone.png^nftools_mineral_bismuth.png"}, tiles = {"default_stone.png^nftools_mineral_bismuth.png"},
@ -168,9 +167,10 @@ minetest.register_node("nftools:stone_with_bismuth", {
drop = "nftools:stone_with_bismuth", drop = "nftools:stone_with_bismuth",
}) })
minetest.register_alias ("nftools:alexandrite_ore", "nftools:stone_with_bismuth")
-- =================================================================== -- ===================================================================
-- Smelting (only metals) -- Smelting (only metals).
minetest.register_craft ({ minetest.register_craft ({
type = "cooking", type = "cooking",
@ -179,10 +179,7 @@ minetest.register_craft ({
}) })
-- =================================================================== -- ===================================================================
-- Amber -- Amber.
minetest.register_alias("nftools:amber", "nftools:stone_with_amber")
-- (formerly called amber but dropped chip; use conventions instead)
minetest.register_node ("nftools:stone_with_amber", { minetest.register_node ("nftools:stone_with_amber", {
description = "Rough Amber", description = "Rough Amber",
@ -192,16 +189,18 @@ minetest.register_node("nftools:stone_with_amber", {
drop = "nftools:amber_chip", drop = "nftools:amber_chip",
}) })
minetest.register_alias ("nftools:amber",
"nftools:stone_with_amber")
-- (formerly called amber but dropped chip; use conventions instead)
minetest.register_craftitem ("nftools:amber_chip", { minetest.register_craftitem ("nftools:amber_chip", {
description = "Amber", description = "Amber",
inventory_image = "nftools_amberchip.png", inventory_image = "nftools_amberchip.png",
}) })
-- =================================================================== -- ===================================================================
-- Turquoise (formerly Aquamarine) -- Turquoise (formerly Aquamarine).
minetest.register_alias("nftools:aquamarine_ore", "nftools:stone_with_turquoise")
minetest.register_alias("nftools:aquamarine", "nftools:turquoise")
minetest.register_node ("nftools:stone_with_turquoise", { minetest.register_node ("nftools:stone_with_turquoise", {
description = "Rough Turquoise", description = "Rough Turquoise",
@ -211,22 +210,25 @@ minetest.register_node("nftools:stone_with_turquoise", {
drop = "nftools:turquoise", drop = "nftools:turquoise",
}) })
minetest.register_alias ("nftools:aquamarine_ore", "nftools:stone_with_turquoise")
minetest.register_craftitem ("nftools:turquoise", { minetest.register_craftitem ("nftools:turquoise", {
description = "Turquoise", description = "Turquoise",
inventory_image = "nftools_turquoise.png", inventory_image = "nftools_turquoise.png",
}) })
-- =================================================================== minetest.register_alias ("nftools:aquamarine", "nftools:turquoise")
-- Black Opal (formerly Amethyst)
minetest.register_alias("nftools:amethyst_ore", "nftools:stone_with_blackopal") -- ===================================================================
minetest.register_alias("nftools:amethyst", "nftools:blackopal") -- Black Opal (formerly Amethyst).
minetest.register_craftitem ("nftools:blackopal", { minetest.register_craftitem ("nftools:blackopal", {
description = "Black Opal", description = "Black Opal",
inventory_image = "nftools_blackopal.png", inventory_image = "nftools_blackopal.png",
}) })
minetest.register_alias ("nftools:amethyst", "nftools:blackopal")
minetest.register_node ("nftools:stone_with_blackopal", { minetest.register_node ("nftools:stone_with_blackopal", {
description = "Rough Black Opal", description = "Rough Black Opal",
tiles = {"default_stone.png^nftools_mineral_blackopal.png"}, tiles = {"default_stone.png^nftools_mineral_blackopal.png"},
@ -235,6 +237,8 @@ minetest.register_node("nftools:stone_with_blackopal", {
drop = "nftools:blackopal", drop = "nftools:blackopal",
}) })
minetest.register_alias ("nftools:amethyst_ore", "nftools:stone_with_blackopal")
-- =================================================================== -- ===================================================================
-- Sunflower. -- Sunflower.
@ -257,8 +261,7 @@ minetest.register_node("nftools:sunflower", {
}) })
-- =================================================================== -- ===================================================================
-- Blocks -- Blocks.
minetest.register_node ("nftools:amberblock", { minetest.register_node ("nftools:amberblock", {
description = "Amber Block", description = "Amber Block",
@ -278,6 +281,7 @@ local function registerblockrecipe(name, blockname)
{name, name, name} {name, name, name}
} }
}) })
minetest.register_craft ({ minetest.register_craft ({
output = name..' 9', output = name..' 9',
recipe = { recipe = {
@ -296,7 +300,6 @@ if minetest.get_modpath("quartz") ~= nil then
{'', 'quartz:quartz_crystal', ''}, {'', 'quartz:quartz_crystal', ''},
{'quartz:quartz_crystal', 'nftools:amberblock', 'quartz:quartz_crystal'} {'quartz:quartz_crystal', 'nftools:amberblock', 'quartz:quartz_crystal'}
} }
}) })
minetest.register_craft ({ minetest.register_craft ({
@ -308,7 +311,7 @@ if minetest.get_modpath("quartz") ~= nil then
end end
-- =================================================================== -- ===================================================================
-- Scythe -- Scythe.
minetest.register_tool ("nftools:scythe", { minetest.register_tool ("nftools:scythe", {
description = "Scythe", description = "Scythe",
@ -333,7 +336,7 @@ minetest.register_craft({
}) })
-- =================================================================== -- ===================================================================
-- Mace -- Mace.
minetest.register_tool ("nftools:mace", { minetest.register_tool ("nftools:mace", {
description = "Mace", description = "Mace",

Loading…
Cancel
Save