technic_cnc: Use client-side translation API

technic/doc/api.md

@@ -160,11 +160,6 @@ Unsorted functions:
 	* If `technic.power_tools[itemstack:get_name()]` is `nil` (or `false`), this
 	  function does nothing, else that value is the maximum charge.
 	* The itemstack metadata is changed to contain the charge.
-* `technic.get_charge(itemstack)`
-	* Returns the charge and max charge of the given itemstack.
-	* If the itemstack is not an RE chargeable item, both return values will be zero.
-* `technic.set_charge(itemstack, charge)`
-	* Modifies the charge of the given itemstack.
 
 ### Node-specific
 * `technic.get_or_load_node(pos)`

technic/machines/LV/grinder.lua

@@ -9,25 +9,5 @@ minetest.register_craft({
 	}
 })
 
-if (minetest.get_modpath('everness')) then
-	minetest.register_craft({
-		output = 'technic:lv_grinder',
-		recipe = {
-			{'everness:coral_desert_stone', 'default:diamond',        'everness:coral_desert_stone'},
-			{'everness:coral_desert_stone', 'technic:machine_casing', 'everness:coral_desert_stone'},
-			{'technic:granite',             'technic:lv_cable',       'technic:granite'},
-		}
-	})
-
-	minetest.register_craft({
-		output = 'technic:lv_grinder',
-		recipe = {
-			{'everness:forsaken_desert_stone', 'default:diamond',        'everness:forsaken_desert_stone'},
-			{'everness:forsaken_desert_stone', 'technic:machine_casing', 'everness:forsaken_desert_stone'},
-			{'technic:granite',                'technic:lv_cable',       'technic:granite'},
-		}
-	})
-end
-
 technic.register_grinder({tier="LV", demand={200}, speed=1})
 

technic/machines/other/frames.lua

@@ -324,7 +324,6 @@ for zp = 0, 1 do
 
 		on_rightclick = function(pos, node, placer, itemstack, pointed_thing)
 			if is_supported_node(itemstack:get_name()) then
-				-- Stripped down version of "core.item_place_node"
 				if minetest.is_protected(pos, placer:get_player_name()) then
 					minetest.log("action", placer:get_player_name()
 						.. " tried to place " .. itemstack:get_name()
@@ -348,7 +347,8 @@ for zp = 0, 1 do
 				end
 
 				-- Run script hook
-				for _, callback in ipairs(minetest.registered_on_placenodes) do
+				local callback = nil
+				for _, _ in ipairs(minetest.registered_on_placenodes) do
 					-- Copy pos and node because callback can modify them
 					local pos_copy = { x = pos.x, y = pos.y, z = pos.z }
 					local newnode_copy = { name = def.name, param1 = 0, param2 = 0 }

technic/machines/register/battery_box.lua

@@ -409,7 +409,7 @@ minetest.register_on_player_receive_fields(
 	end
 )
 
-function technic.get_charge(itemstack)
+local function default_get_charge(itemstack)
 	-- check if is chargable
 	local tool_name = itemstack:get_name()
 	if not technic.power_tools[tool_name] then
@@ -419,7 +419,7 @@ function technic.get_charge(itemstack)
 	return item_meta:get_int("technic:charge"), technic.power_tools[tool_name]
 end
 
-function technic.set_charge(itemstack, charge)
+local function default_set_charge(itemstack, charge)
 	local tool_name = itemstack:get_name()
 	if technic.power_tools[tool_name] then
 		technic.set_RE_wear(itemstack, charge, technic.power_tools[tool_name])
@@ -437,8 +437,8 @@ function technic.charge_tools(meta, batt_charge, charge_step)
 
 	-- get callbacks
 	local src_def = src_stack:get_definition()
-	local technic_get_charge = src_def.technic_get_charge or technic.get_charge
-	local technic_set_charge = src_def.technic_set_charge or technic.set_charge
+	local technic_get_charge = src_def.technic_get_charge or default_get_charge
+	local technic_set_charge = src_def.technic_set_charge or default_set_charge
 
 	-- get tool charge
 	local tool_charge, item_max_charge = technic_get_charge(src_stack)
@@ -471,8 +471,8 @@ function technic.discharge_tools(meta, batt_charge, charge_step, max_charge)
 
 	-- get callbacks
 	local src_def = src_stack:get_definition()
-	local technic_get_charge = src_def.technic_get_charge or technic.get_charge
-	local technic_set_charge = src_def.technic_set_charge or technic.set_charge
+	local technic_get_charge = src_def.technic_get_charge or default_get_charge
+	local technic_set_charge = src_def.technic_set_charge or default_set_charge
 
 	-- get tool charge
 	local tool_charge, item_max_charge = technic_get_charge(src_stack)

technic/machines/register/compressor_recipes.lua

@@ -8,71 +8,6 @@ function technic.register_compressor_recipe(data)
 	technic.register_recipe("compressing", data)
 end
 
--- Defuse the default recipes, since we have
--- the compressor to take over in a more realistic manner.
-local crafts_to_clear = {
-	"default:desert_sand",
-	"default:sand",
-	"default:silver_sand",
-}
-
-local dependent_crafts_to_clear = {
-	everness = {
-		"everness:coral_sand",
-		"everness:coral_forest_deep_ocean_sand",
-		"everness:coral_white_sand",
-		"everness:crystal_sand",
-		"everness:cursed_sand",
-		"everness:cursed_lands_deep_ocean_sand",
-		"everness:crystal_forest_deep_ocean_sand",
-		"everness:mineral_sand",
-	},
-	nether = {
-		"nether:brick",
-		"nether:brick_compressed",
-		"nether:rack",
-		"nether:rack_deep",
-	},
-}
-
--- Add dependent recipes to main collection of
--- recipes to be cleared if their mods are used.
-for dependency, crafts in pairs(dependent_crafts_to_clear) do
-	if minetest.get_modpath(dependency) then
-		for _, craft_entry in ipairs(crafts) do
-			table.insert(crafts_to_clear, craft_entry)
-		end
-	end
-end
-
--- Clear recipes
-for _, craft_name in ipairs(crafts_to_clear) do
-	-- Regular bricks are 2x2 shaped, nether bricks are 3x3 shaped (irregular)
-	local is_regular = string.sub(craft_name, 1, 12) ~= "nether:brick"
-	local shaped_recipe
-
-	if is_regular then
-		shaped_recipe = {
-			{craft_name, craft_name},
-			{craft_name, craft_name},
-		}
-	else
-		shaped_recipe = {
-			{craft_name, craft_name, craft_name},
-			{craft_name, craft_name, craft_name},
-			{craft_name, craft_name, craft_name},
-		}
-	end
-
-	minetest.clear_craft({
-		type = "shaped",
-		recipe = shaped_recipe,
-	})
-end
-
---
--- Compile compressor recipes
---
 local recipes = {
 	{"default:snowblock",          "default:ice"},
 	{"default:sand 2",             "default:sandstone"},
@@ -86,8 +21,8 @@ local recipes = {
 	{"technic:uranium35_ingot 5",  "technic:uranium_fuel"},
 }
 
-local dependent_recipes = {
-	everness = {
+if minetest.get_modpath("everness") then
+	local everness_sand_to_sandstone_recipes = {
 		{"everness:coral_deep_ocean_sand 2",          "everness:coral_deep_ocean_sandstone_block"},
 		{"everness:coral_sand 2",                     "everness:coral_sandstone"},
 		{"everness:coral_white_sand 2",               "everness:coral_white_sandstone"},
@@ -96,26 +31,47 @@ local dependent_recipes = {
 		{"everness:cursed_lands_deep_ocean_sand 2",   "everness:cursed_lands_deep_ocean_sandstone_block"},
 		{"everness:cursed_sand 2",                    "everness:cursed_sandstone_block"},
 		{"everness:mineral_sand 2",                   "everness:mineral_sandstone"},
-	},
-	nether = {
-		{"nether:brick 9",				"nether:brick_compressed"},
-		{"nether:brick_compressed 9",	"nether:nether_lump"},
-		{"nether:rack",                 "nether:brick",},
-		{"nether:rack_deep",            "nether:brick_deep"},
-	},
-}
+	}
 
--- Add dependent recipes to main recipe collection
--- if their mods are used.
-for dependency, recipes_to_add in pairs(dependent_recipes) do
-	if minetest.get_modpath(dependency) then
-		for _, recipe_entry in ipairs(recipes_to_add) do
-			table.insert(recipes, recipe_entry)
-		end
+	for _, data in ipairs(everness_sand_to_sandstone_recipes) do
+		table.insert(recipes, {data[1], data[2]})
 	end
 end
 
--- Register compressor recipes
+-- defuse the default sandstone recipe, since we have the compressor to take over in a more realistic manner
+local crafts_to_clear = {
+	"default:desert_sand",
+	"default:sand",
+	"default:silver_sand"
+}
+
+if minetest.get_modpath("everness") then
+	local everness_crafts_to_clear = {
+		"everness:coral_sand",
+		"everness:coral_forest_deep_ocean_sand",
+		"everness:coral_white_sand",
+		"everness:crystal_sand",
+		"everness:cursed_sand",
+		"everness:cursed_lands_deep_ocean_sand",
+		"everness:crystal_forest_deep_ocean_sand",
+		"everness:mineral_sand",
+	}
+
+	for _, sand_name in ipairs(everness_crafts_to_clear) do
+		table.insert(crafts_to_clear, sand_name)
+	end
+end
+
+for _, sand_name in ipairs(crafts_to_clear) do
+	minetest.clear_craft({
+		type = "shaped",
+		recipe = {
+			{sand_name, sand_name},
+			{sand_name, sand_name},
+		},
+	})
+end
+
 for _, data in pairs(recipes) do
 	technic.register_compressor_recipe({input = {data[1]}, output = data[2]})
 end

technic/machines/register/grinder_recipes.lua

@@ -36,73 +36,73 @@ local recipes = {
 	{"default:ice",              "default:snowblock"},
 }
 
-local dependent_recipes = {
-	-- Sandstones
-	everness = {
-		{"everness:coral_deep_ocean_sandstone_block",			"everness:coral_deep_ocean_sand 2"},
-		{"everness:coral_sandstone",							"everness:coral_sand 2"},
-		{"everness:coral_white_sandstone",						"everness:coral_white_sand 2"},
-		{"everness:crystal_forest_deep_ocean_sandstone_block",	"everness:crystal_forest_deep_ocean_sand 2"},
-		{"everness:crystal_sandstone",							"everness:crystal_sand 2"},
-		{"everness:cursed_lands_deep_ocean_sandstone_block",	"everness:cursed_lands_deep_ocean_sand 2"},
-		{"everness:cursed_sandstone_block",						"everness:cursed_sand 2"},
-		{"everness:mineral_sandstone",							"everness:mineral_sand 2"},
-	-- Lumps and wheat
-		{"everness:pyrite_lump",	"technic:pyrite_dust 2"},
-	},
-	farming = {
-		{"farming:seed_wheat",		"farming:flour 1"},
-	},
-	gloopores = {
-		{"gloopores:alatro_lump",	"technic:alatro_dust 2"},
-		{"gloopores:kalite_lump",	"technic:kalite_dust 2"},
-		{"gloopores:arol_lump",		"technic:arol_dust 2"},
-		{"gloopores:talinite_lump",	"technic:talinite_dust 2"},
-		{"gloopores:akalin_lump",	"technic:akalin_dust 2"},
-	},
-	homedecor = {
-		{"home_decor:brass_ingot",	"technic:brass_dust 1"},
-	},
-	moreores = {
-		{"moreores:mithril_lump",	"technic:mithril_dust 2"},
-		{"moreores:silver_lump",	"technic:silver_dust 2"},
-	},
-	nether = {
-		{"nether:nether_lump",		"technic:nether_dust 2"},
-	},
-}
-
-for dependency, materials_to_add in pairs(dependent_recipes) do
-	if minetest.get_modpath(dependency) then
-		for _, material_entry in ipairs(materials_to_add) do
-			table.insert(recipes, material_entry)
-		end
-	end
+if minetest.get_modpath("everness") then
+	table.insert(recipes, {"everness:coral_deep_ocean_sandstone_block",          "everness:coral_deep_ocean_sand 2"})
+	table.insert(recipes, {"everness:coral_sandstone",                           "everness:coral_sand 2"})
+	table.insert(recipes, {"everness:coral_white_sandstone",                     "everness:coral_white_sand 2"})
+	table.insert(recipes, {"everness:crystal_forest_deep_ocean_sandstone_block", "everness:crystal_forest_deep_ocean_sand 2"})
+	table.insert(recipes, {"everness:crystal_sandstone",                         "everness:crystal_sand 2"})
+	table.insert(recipes, {"everness:cursed_lands_deep_ocean_sandstone_block",   "everness:cursed_lands_deep_ocean_sand 2"})
+	table.insert(recipes, {"everness:cursed_sandstone_block",                    "everness:cursed_sand 2"})
+	table.insert(recipes, {"everness:mineral_sandstone",                         "everness:mineral_sand 2"})
 end
 
 -- defuse the sandstone -> 4 sand recipe to avoid infinite sand bugs (also consult the inverse compressor recipe)
 minetest.clear_craft({
-	recipe = {{"default:sandstone"}},
+	recipe = {
+		{"default:sandstone"}
+	},
 })
 minetest.clear_craft({
-	recipe = {{"default:desert_sandstone"}},
+	recipe = {
+		{"default:desert_sandstone"}
+	},
 })
 minetest.clear_craft({
-	recipe = {{"default:silver_sandstone"}},
+	recipe = {
+		{"default:silver_sandstone"}
+	},
 })
 
 if minetest.get_modpath("everness") then
 	minetest.clear_craft({
-		recipe = {{"everness:mineral_sandstone"}},
+		recipe = {
+			{"everness:mineral_sandstone"}
+		},
 	})
 	-- Currently (2024-03-09), there seem to be no reverse recipes for any of the other everness sandstones.
 end
 
-for _, data in ipairs(recipes) do
+if minetest.get_modpath("farming") then
+	table.insert(recipes, {"farming:seed_wheat",   "farming:flour 1"})
+end
+
+if minetest.get_modpath("moreores") then
+	table.insert(recipes, {"moreores:mithril_lump",   "technic:mithril_dust 2"})
+	table.insert(recipes, {"moreores:silver_lump",    "technic:silver_dust 2"})
+end
+
+if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then
+	table.insert(recipes, {"gloopores:alatro_lump",   "technic:alatro_dust 2"})
+	table.insert(recipes, {"gloopores:kalite_lump",   "technic:kalite_dust 2"})
+	table.insert(recipes, {"gloopores:arol_lump",     "technic:arol_dust 2"})
+	table.insert(recipes, {"gloopores:talinite_lump", "technic:talinite_dust 2"})
+	table.insert(recipes, {"gloopores:akalin_lump",   "technic:akalin_dust 2"})
+end
+
+if minetest.get_modpath("homedecor") then
+	table.insert(recipes, {"home_decor:brass_ingot", "technic:brass_dust 1"})
+end
+
+if minetest.get_modpath("everness") then
+	table.insert(recipes, {"everness:pyrite_lump",  "technic:pyrite_dust 2"})
+end
+
+for _, data in pairs(recipes) do
 	technic.register_grinder_recipe({input = {data[1]}, output = data[2]})
 end
 
--- Dusts
+-- dusts
 local function register_dust(name, ingot)
 	local lname = string.lower(name)
 	lname = string.gsub(lname, ' ', '_')
@@ -120,57 +120,36 @@ local function register_dust(name, ingot)
 	end
 end
 
--- Sorted alphabetically
-local dusts = {
-	{"Brass",           "basic_materials:brass_ingot"},
-	{"Bronze",          "default:bronze_ingot"},
-	{"Carbon Steel",    "technic:carbon_steel_ingot"},
-	{"Cast Iron",       "technic:cast_iron_ingot"},
-	{"Chernobylite",    "technic:chernobylite_block"},
-	{"Chromium",        "technic:chromium_ingot"},
-	{"Coal",            nil},
-	{"Copper",          "default:copper_ingot"},
-	{"Lead",            "technic:lead_ingot"},
-	{"Gold",            "default:gold_ingot"},
-	{"Mithril",         "moreores:mithril_ingot"},
-	{"Silver",          "moreores:silver_ingot"},
-	{"Stainless Steel", "technic:stainless_steel_ingot"},
-	{"Stone",           "default:stone"},
-	{"Sulfur",          nil},
-	{"Tin",             "default:tin_ingot"},
-	{"Wrought Iron",    "technic:wrought_iron_ingot"},
-	{"Zinc",            "technic:zinc_ingot"},
-}
-
-local dependent_dusts = {
-	everness = {
-		{"Pyrite",          "everness:pyrite_ingot"},
-	},
-	gloopores = {
-		{"Akalin",          "glooptest:akalin_ingot"},
-		{"Alatro",          "glooptest:alatro_ingot"},
-		{"Arol",            "glooptest:arol_ingot"},
-		{"Kalite",          nil},
-		{"Talinite",        "glooptest:talinite_ingot"},
-	},
-	nether = {
-		{"Nether",          "nether:nether_ingot"},
-	},
-}
-
-for dependency, dusts_to_add in pairs(dependent_dusts) do
-	if minetest.get_modpath(dependency) then
-		for _, dust_entry in pairs(dusts_to_add) do
-			table.insert(dusts, dust_entry)
-		end
-	end
+-- Sorted alphibeticaly
+register_dust("Brass",           "basic_materials:brass_ingot")
+register_dust("Bronze",          "default:bronze_ingot")
+register_dust("Carbon Steel",    "technic:carbon_steel_ingot")
+register_dust("Cast Iron",       "technic:cast_iron_ingot")
+register_dust("Chernobylite",    "technic:chernobylite_block")
+register_dust("Chromium",        "technic:chromium_ingot")
+register_dust("Coal",            nil)
+register_dust("Copper",          "default:copper_ingot")
+register_dust("Lead",            "technic:lead_ingot")
+register_dust("Gold",            "default:gold_ingot")
+register_dust("Mithril",         "moreores:mithril_ingot")
+register_dust("Silver",          "moreores:silver_ingot")
+register_dust("Stainless Steel", "technic:stainless_steel_ingot")
+register_dust("Stone",           "default:stone")
+register_dust("Sulfur",          nil)
+register_dust("Tin",             "default:tin_ingot")
+register_dust("Wrought Iron",    "technic:wrought_iron_ingot")
+register_dust("Zinc",            "technic:zinc_ingot")
+if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then
+	register_dust("Akalin",          "glooptest:akalin_ingot")
+	register_dust("Alatro",          "glooptest:alatro_ingot")
+	register_dust("Arol",            "glooptest:arol_ingot")
+	register_dust("Kalite",          nil)
+	register_dust("Talinite",        "glooptest:talinite_ingot")
+end
+if minetest.get_modpath("everness") then
+	register_dust("Pyrite",          "everness:pyrite_ingot")
 end
 
-for _, data in ipairs(dusts) do
-	register_dust(data[1], data[2])
-end
-
--- Uranium
 for p = 0, 35 do
 	local nici = (p ~= 0 and p ~= 7 and p ~= 35) and 1 or nil
 	local psuffix = p == 7 and "" or p
@@ -206,7 +185,6 @@ for pa = 0, 34 do
 	end
 end
 
--- Fuels
 minetest.register_craft({
 	type = "fuel",
 	recipe = "technic:coal_dust",

technic/mod.conf

@@ -1,3 +1,3 @@
 name = technic
 depends = default, pipeworks, technic_worldgen, basic_materials
-optional_depends = bucket, screwdriver, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye, craftguide, i3, everness, nether
+optional_depends = bucket, screwdriver, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye, craftguide, i3, everness

technic_cnc/cnc.lua

@@ -72,68 +72,74 @@ else
 	end
 end
 
-local function add_buttons(do_variants, t, x, y)
-	local X_OFFSET = 1
-	local BUTTONS_PER_ROW = 7
+local onesize_products = {
+	slope                    = 2,
+	slope_edge               = 1,
+	slope_inner_edge         = 1,
+	pyramid                  = 2,
+	spike                    = 1,
+	cylinder                 = 2,
+	oblate_spheroid          = 1,
+	sphere                   = 1,
+	stick                    = 8,
+	slope_upsdown            = 2,
+	slope_edge_upsdown       = 1,
+	slope_inner_edge_upsdown = 1,
+	cylinder_horizontal      = 2,
+	slope_lying              = 2,
+	onecurvededge            = 1,
+	twocurvededge            = 1,
+}
+local twosize_products = {
+	element_straight         = 2,
+	element_end              = 2,
+	element_cross            = 1,
+	element_t                = 1,
+	element_edge             = 2,
+}
 
-	-- ipairs: only iterate over continuous integers
-	for _, data in ipairs(technic_cnc.programs) do
-		-- Never add full variants. Only add half variants when asked
-		if not data.half_counterpart and (do_variants == (data.full_counterpart ~= nil)) then
-			--print("add", data.suffix)
-			t[#t + 1] = ("image_button[%g,%g;1,1;%s.png;%s; ]"):format(
-				x + X_OFFSET, y, data.suffix, data.short_name
-			)
-			t[#t + 1] = ("tooltip[%s;%s]"):format(
-				data.short_name, minetest.formspec_escape(data.desc .. " (* " .. data.output .. ")")
-			)
+local cnc_formspec =
+	"size[9,11;]"..
+	"label[1,0;"..S("Choose Milling Program:").."]"..
+	"image_button[1,0.5;1,1;technic_cnc_slope.png;slope; ]"..
+	"image_button[2,0.5;1,1;technic_cnc_slope_edge.png;slope_edge; ]"..
+	"image_button[3,0.5;1,1;technic_cnc_slope_inner_edge.png;slope_inner_edge; ]"..
+	"image_button[4,0.5;1,1;technic_cnc_pyramid.png;pyramid; ]"..
+	"image_button[5,0.5;1,1;technic_cnc_spike.png;spike; ]"..
+	"image_button[6,0.5;1,1;technic_cnc_cylinder.png;cylinder; ]"..
+	"image_button[7,0.5;1,1;technic_cnc_oblate_spheroid.png;oblate_spheroid; ]"..
+	"image_button[8,0.5;1,1;technic_cnc_stick.png;stick; ]"..
 
-			x = x + 1
-			if x == BUTTONS_PER_ROW then
-				x = 0
-				y = y + 1
-			end
-		end
-	end
-end
+	"image_button[1,1.5;1,1;technic_cnc_slope_upsdwn.png;slope_upsdown; ]"..
+	"image_button[2,1.5;1,1;technic_cnc_slope_edge_upsdwn.png;slope_edge_upsdown; ]"..
+	"image_button[3,1.5;1,1;technic_cnc_slope_inner_edge_upsdwn.png;slope_inner_edge_upsdown; ]"..
+	"image_button[4,1.5;1,1;technic_cnc_cylinder_horizontal.png;cylinder_horizontal; ]"..
+	"image_button[5,1.5;1,1;technic_cnc_sphere.png;sphere; ]"..
 
-local function make_formspec()
-	local t = {
-		"size[9,11;]",
-		"label[1,0;"..S("Choose Milling Program:").."]",
-	}
-	add_buttons(false, t, 0, 0.5)
+	"image_button[1,2.5;1,1;technic_cnc_slope_lying.png;slope_lying; ]"..
+	"image_button[2,2.5;1,1;technic_cnc_onecurvededge.png;onecurvededge; ]"..
+	"image_button[3,2.5;1,1;technic_cnc_twocurvededge.png;twocurvededge; ]"..
 
-	t[#t + 1] = (
-		"label[1,3.5;"..S("Slim Elements half / normal height:").."]"..
-		"image_button[1,4;1,0.5;technic_cnc_full.png;full; ]"..
-		"image_button[1,4.5;1,0.5;technic_cnc_half.png;half; ]"
-	)
-	add_buttons(true, t, 1, 4)
+	"label[1,3.5;"..S("Slim Elements half / normal height:").."]"..
 
-	t[#t + 1] = (
-		"label[0, 5;"..S("In:").."]"..
-		"list[current_name;src;0.5,5.5;1,1;]"..
-		"label[4, 5;"..S("Out:").."]"..
-		"list[current_name;dst;5,5.5;4,1;]"..
+	"image_button[1,4;1,0.5;technic_cnc_full.png;full; ]"..
+	"image_button[1,4.5;1,0.5;technic_cnc_half.png;half; ]"..
+	"image_button[2,4;1,1;technic_cnc_element_straight.png;element_straight; ]"..
+	"image_button[3,4;1,1;technic_cnc_element_end.png;element_end; ]"..
+	"image_button[4,4;1,1;technic_cnc_element_cross.png;element_cross; ]"..
+	"image_button[5,4;1,1;technic_cnc_element_t.png;element_t; ]"..
+	"image_button[6,4;1,1;technic_cnc_element_edge.png;element_edge; ]"..
 
-		"list[current_player;main;0,7;8,4;]"..
-		"listring[current_name;dst]"..
-		"listring[current_player;main]"..
-		"listring[current_name;src]"..
-		"listring[current_player;main]"
-	)
-
-	return table.concat(t)
-end
-
-local cnc_formspec = nil
-
-minetest.register_on_mods_loaded(function()
-	technic_cnc._populate_shortcuts()
-	cnc_formspec = make_formspec()
-end)
+	"label[0, 5;"..S("In:").."]"..
+	"list[current_name;src;0.5,5.5;1,1;]"..
+	"label[4, 5;"..S("Out:").."]"..
+	"list[current_name;dst;5,5.5;4,1;]"..
 
+	"list[current_player;main;0,7;8,4;]"..
+	"listring[current_name;dst]"..
+	"listring[current_player;main]"..
+	"listring[current_name;src]"..
+	"listring[current_player;main]"
 
 -- The form handler is declared here because we need it in both the inactive and active modes
 -- in order to be able to change programs wile it is running.
@@ -162,28 +168,27 @@ local function form_handler(pos, formname, fields, sender)
 
 	for k, _ in pairs(fields) do
 		-- Set a multipier for the half/full size capable blocks
-		local program = technic_cnc.programs["technic_cnc_" .. k]
-		if size == 1 and program and program.full_counterpart then
-			program = technic_cnc.programs["technic_cnc_" .. k .. "_double"]
+		local multiplier
+		if twosize_products[k] ~= nil then
+			multiplier = size * twosize_products[k]
+		else
+			multiplier = onesize_products[k]
 		end
-		if program then
-			local multiplier = program.output
-			local product = inputname .. "_" .. program.suffix
 
+		if onesize_products[k] ~= nil or twosize_products[k] ~= nil then
 			meta:set_float( "cnc_multiplier", multiplier)
 			meta:set_string("cnc_user", sender:get_player_name())
+		end
 
-			if program.half_counterpart then -- is full
-				if size == 1 then
-					meta:set_string("cnc_product", product)
-					--print(product, multiplier)
-				end
-				break -- no larger sizes allowed
-			end
+		if onesize_products[k] ~= nil or (twosize_products[k] ~= nil and size==2) then
+			meta:set_string("cnc_product",  inputname .. "_technic_cnc_" .. k)
+			--print(inputname .. "_technic_cnc_" .. k)
+			break
+		end
 
-			-- half for normal
-			meta:set_string("cnc_product", product)
-			--print(product, multiplier)
+		if twosize_products[k] ~= nil and size==1 then
+			meta:set_string("cnc_product",  inputname .. "_technic_cnc_" .. k .. "_double")
+			--print(inputname .. "_technic_cnc_" .. k .. "_double")
 			break
 		end
 	end
@@ -231,7 +236,7 @@ local run = function(pos, node)
 		meta:set_int("src_time", meta:get_int("src_time") + 1)
 		if meta:get_int("src_time") >= 3 then -- 3 ticks per output
 			meta:set_int("src_time", 0)
-			local srcstack = inv:get_stack("src", 1)
+			srcstack = inv:get_stack("src", 1)
 			srcstack:take_item()
 			inv:set_stack("src", 1, srcstack)
 			inv:add_item("dst", result.." "..meta:get_int("cnc_multiplier"))

technic_cnc/cnc_api.lua

@@ -8,27 +8,16 @@ local ALPHA_CLIP = minetest.features.use_texture_alpha_string_modes and "clip" o
 ------------------------------------------------------
 
 -- Define slope boxes for the various nodes
---[[
-Additional keys after registration:
-	programs[program.suffix] = program
-
-Additional fields after registration:
-	program.short_name = (trimmed suffix)
-	program.full_counterpart = suffix (optional, for full/half variants)
-	program.half_counterpart = suffix (optional, for full/half variants)
-]]
 -------------------------------------------
 technic_cnc.programs = {
 	{ suffix  = "technic_cnc_stick",
 		model = {-0.15, -0.5, -0.15, 0.15, 0.5, 0.15},
-		desc  = S("Stick"),
-		output = 8
+		desc  = S("Stick")
 	},
 
 	{ suffix  = "technic_cnc_element_end_double",
 		model = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.5},
-		desc  = S("Element End Double"),
-		output = 2
+		desc  = S("Element End Double")
 	},
 
 	{ suffix  = "technic_cnc_element_cross_double",
@@ -36,8 +25,7 @@ technic_cnc.programs = {
 			{0.3, -0.5, -0.3, 0.5, 0.5, 0.3},
 			{-0.3, -0.5, -0.5, 0.3, 0.5, 0.5},
 			{-0.5, -0.5, -0.3, -0.3, 0.5, 0.3}},
-		desc  = S("Element Cross Double"),
-		output = 1
+		desc  = S("Element Cross Double")
 	},
 
 	{ suffix  = "technic_cnc_element_t_double",
@@ -45,28 +33,24 @@ technic_cnc.programs = {
 			{-0.3, -0.5, -0.5, 0.3, 0.5, 0.3},
 			{-0.5, -0.5, -0.3, -0.3, 0.5, 0.3},
 			{0.3, -0.5, -0.3, 0.5, 0.5, 0.3}},
-		desc  = S("Element T Double"),
-		output = 1
+		desc  = S("Element T Double")
 	},
 
 	{ suffix  = "technic_cnc_element_edge_double",
 		model = {
 			{-0.3, -0.5, -0.5, 0.3, 0.5, 0.3},
 			{-0.5, -0.5, -0.3, -0.3, 0.5, 0.3}},
-		desc  = S("Element Edge Double"),
-		output = 2
+		desc  = S("Element Edge Double")
 	},
 
 	{ suffix  = "technic_cnc_element_straight_double",
 		model = {-0.3, -0.5, -0.5, 0.3, 0.5, 0.5},
-		desc  = S("Element Straight Double"),
-		output = 2
+		desc  = S("Element Straight Double")
 	},
 
 	{ suffix  = "technic_cnc_element_end",
 		model = {-0.3, -0.5, -0.3, 0.3, 0, 0.5},
-		desc  = S("Element End"),
-		output = nil -- calculated
+		desc  = S("Element End")
 	},
 
 	{ suffix  = "technic_cnc_element_cross",
@@ -74,8 +58,7 @@ technic_cnc.programs = {
 			{0.3, -0.5, -0.3, 0.5, 0, 0.3},
 			{-0.3, -0.5, -0.5, 0.3, 0, 0.5},
 			{-0.5, -0.5, -0.3, -0.3, 0, 0.3}},
-		desc  = S("Element Cross"),
-		output = nil -- calculated
+		desc  = S("Element Cross")
 	},
 
 	{ suffix  = "technic_cnc_element_t",
@@ -83,22 +66,19 @@ technic_cnc.programs = {
 			{-0.3, -0.5, -0.5, 0.3, 0, 0.3},
 			{-0.5, -0.5, -0.3, -0.3, 0, 0.3},
 			{0.3, -0.5, -0.3, 0.5, 0, 0.3}},
-		desc  = S("Element T"),
-		output = nil -- calculated
+		desc  = S("Element T")
 	},
 
 	{ suffix  = "technic_cnc_element_edge",
 		model = {
 			{-0.3, -0.5, -0.5, 0.3, 0, 0.3},
 			{-0.5, -0.5, -0.3, -0.3, 0, 0.3}},
-		desc  = S("Element Edge"),
-		output = nil -- calculated
+		desc  = S("Element Edge")
 	},
 
 	{ suffix  = "technic_cnc_element_straight",
 		model = {-0.3, -0.5, -0.5, 0.3, 0, 0.5},
-		desc  = S("Element Straight"),
-		output = nil -- calculated
+		desc  = S("Element Straight")
 	},
 
 	{ suffix  = "technic_cnc_oblate_spheroid",
@@ -111,38 +91,32 @@ technic_cnc.programs = {
 				{ -8/16, -4/16, -8/16, 8/16,  4/16, 8/16 },
 				{ -6/16, -8/16, -6/16, 6/16, -4/16, 6/16 }
 			}
-		},
-		output = 1
+		}
 	},
 
 	{ suffix  = "technic_cnc_sphere",
 		model = "technic_cnc_sphere.obj",
-		desc  = S("Sphere"),
-		output = 1
+		desc  = S("Sphere")
 	},
 
 	{ suffix  = "technic_cnc_cylinder_horizontal",
 		model = "technic_cnc_cylinder_horizontal.obj",
-		desc  = S("Horizontal Cylinder"),
-		output = 2
+		desc  = S("Horizontal Cylinder")
 	},
 
 	{ suffix  = "technic_cnc_cylinder",
 		model = "technic_cnc_cylinder.obj",
-		desc  = S("Cylinder"),
-		output = 2
+		desc  = S("Cylinder")
 	},
 
 	{ suffix  = "technic_cnc_twocurvededge",
 		model = "technic_cnc_two_curved_edge.obj",
-		desc  = S("Two Curved Edge/Corner Block"),
-		output = 1
+		desc  = S("Two Curved Edge/Corner Block")
 	},
 
 	{ suffix  = "technic_cnc_onecurvededge",
 		model = "technic_cnc_one_curved_edge.obj",
-		desc  = S("One Curved Edge Block"),
-		output = 1
+		desc  = S("One Curved Edge Block")
 	},
 
 	{ suffix  = "technic_cnc_spike",
@@ -156,8 +130,7 @@ technic_cnc.programs = {
 				{ -6/16, -4/16, -6/16, 6/16,     0, 6/16 },
 				{ -8/16, -8/16, -8/16, 8/16, -4/16, 8/16 }
 			}
-		},
-		output = 1
+		}
 	},
 
 	{ suffix  = "technic_cnc_pyramid",
@@ -171,8 +144,7 @@ technic_cnc.programs = {
 				{ -6/16, -6/16, -6/16, 6/16, -4/16, 6/16 },
 				{ -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }
 			}
-		},
-		output = 2
+		}
 	},
 
 	{ suffix  = "technic_cnc_slope_inner_edge_upsdown",
@@ -193,8 +165,7 @@ technic_cnc.programs = {
 				{ -0.5,   0.25, -0.25, 0.5,  0,     0.5  },
 				{ -0.5,   0.5,  -0.5,  0.5,  0.25,  0.5  }
 			}
-		},
-		output = 1
+		}
 	},
 
 	{ suffix  = "technic_cnc_slope_edge_upsdown",
@@ -208,8 +179,7 @@ technic_cnc.programs = {
 				{     0,     0,     0, 8/16, -4/16, 8/16 },
 				{  4/16, -4/16,  4/16, 8/16, -8/16, 8/16 }
 			}
-		},
-		output = 1
+		}
 	},
 
 	{ suffix  = "technic_cnc_slope_inner_edge",
@@ -230,8 +200,7 @@ technic_cnc.programs = {
 				{ -0.5,   0.25,  0.25, 0.5,  0.5,   0.5  },
 				{  0.25,  0.25, -0.5,  0.5,  0.5,   0.5  }
 			}
-		},
-		output = 1
+		}
 	},
 
 	{ suffix  = "technic_cnc_slope_edge",
@@ -245,8 +214,7 @@ technic_cnc.programs = {
 				{ -4/16, -4/16, -4/16, 8/16,     0, 8/16 },
 				{ -8/16, -8/16, -8/16, 8/16, -4/16, 8/16 }
 			}
-		},
-		output = 1
+		}
 	},
 
 	{ suffix  = "technic_cnc_slope_upsdown",
@@ -260,8 +228,7 @@ technic_cnc.programs = {
 				{ -8/16,     0,     0, 8/16, -4/16, 8/16 },
 				{ -8/16, -4/16,  4/16, 8/16, -8/16, 8/16 }
 			}
-		},
-		output = 1
+		}
 	},
 
 	{ suffix  = "technic_cnc_slope_lying",
@@ -275,8 +242,7 @@ technic_cnc.programs = {
 				{ -4/16, -8/16, -4/16,     0, 8/16, 8/16 },
 				{ -8/16, -8/16, -8/16, -4/16, 8/16, 8/16 }
 			}
-		},
-		output = 2
+		}
 	},
 
 	{ suffix  = "technic_cnc_slope",
@@ -290,40 +256,11 @@ technic_cnc.programs = {
 				{ -8/16, -4/16, -4/16, 8/16,     0, 8/16 },
 				{ -8/16, -8/16, -8/16, 8/16, -4/16, 8/16 }
 			}
-		},
-		output = 2
+		}
 	},
 
 }
 
-technic_cnc._populate_shortcuts = function()
-	-- Program quick access by string key
-	for _, data in ipairs(technic_cnc.programs) do
-		technic_cnc.programs[data.suffix] = data
-		data.short_name = assert(data.suffix:match("technic_cnc_(%S+)"))
-	end
-
-	-- Detect half/full counterparts
-	for k, data in pairs(technic_cnc.programs) do
-		if type(k) == "string" then
-			local full = technic_cnc.programs[k .. "_double"]
-			if full then
-				full.half_counterpart = k
-				data.full_counterpart = k .. "_double"
-				data.output = full.output * 2
-
-				--print("populate", k)
-			end
-		end
-	end
-
-	-- Final checks
-	for _, data in ipairs(technic_cnc.programs) do
-		assert(type(data.output) == "number", data.suffix)
-		assert(type(data.short_name) == "string", data.suffix)
-	end
-end
-
 -- Allow disabling certain programs for some node. Default is allowing all types for all nodes
 technic_cnc.programs_disable = {
 	-- ["default:brick"] = {"technic_cnc_stick"}, -- Example: Disallow the stick for brick
@@ -390,3 +327,44 @@ function technic_cnc.register_all(recipeitem, groups, images, description)
 	end
 end
 
+-- REGISTER NEW TECHNIC_CNC_API's PART 2: technic_cnc..register_element_end(subname, recipeitem, groups, images, desc_element_xyz)
+-----------------------------------------------------------------------------------------------------------------------
+function technic_cnc.register_slope_edge_etc(recipeitem, groups, images, desc_slope, desc_slope_lying, desc_slope_upsdown, desc_slope_edge, desc_slope_inner_edge, desc_slope_upsdwn_edge, desc_slope_upsdwn_inner_edge, desc_pyramid, desc_spike, desc_onecurvededge, desc_twocurvededge, desc_cylinder, desc_cylinder_horizontal, desc_spheroid, desc_element_straight, desc_element_edge, desc_element_t, desc_element_cross, desc_element_end)
+		-- TODO: Remove this evil sorcery
+         technic_cnc.register_slope(recipeitem, groups, images, desc_slope)
+         technic_cnc.register_slope_lying(recipeitem, groups, images, desc_slope_lying)
+         technic_cnc.register_slope_upsdown(recipeitem, groups, images, desc_slope_upsdown)
+         technic_cnc.register_slope_edge(recipeitem, groups, images, desc_slope_edge)
+         technic_cnc.register_slope_inner_edge(recipeitem, groups, images, desc_slope_inner_edge)
+         technic_cnc.register_slope_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_edge)
+         technic_cnc.register_slope_inner_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_inner_edge)
+         technic_cnc.register_pyramid(recipeitem, groups, images, desc_pyramid)
+         technic_cnc.register_spike(recipeitem, groups, images, desc_spike)
+         technic_cnc.register_onecurvededge(recipeitem, groups, images, desc_onecurvededge)
+         technic_cnc.register_twocurvededge(recipeitem, groups, images, desc_twocurvededge)
+         technic_cnc.register_cylinder(recipeitem, groups, images, desc_cylinder)
+         technic_cnc.register_cylinder_horizontal(recipeitem, groups, images, desc_cylinder_horizontal)
+         technic_cnc.register_spheroid(recipeitem, groups, images, desc_spheroid)
+         technic_cnc.register_element_straight(recipeitem, groups, images, desc_element_straight)
+         technic_cnc.register_element_edge(recipeitem, groups, images, desc_element_edge)
+         technic_cnc.register_element_t(recipeitem, groups, images, desc_element_t)
+         technic_cnc.register_element_cross(recipeitem, groups, images, desc_element_cross)
+         technic_cnc.register_element_end(recipeitem, groups, images, desc_element_end)
+end
+
+-- REGISTER STICKS: noncubic.register_xyz(recipeitem, groups, images, desc_element_xyz)
+------------------------------------------------------------------------------------------------------------
+function technic_cnc.register_stick_etc(recipeitem, groups, images, desc_stick)
+		-- TODO: Remove this evil sorcery
+         technic_cnc.register_stick(recipeitem, groups, images, desc_stick)
+end
+
+function technic_cnc.register_elements(recipeitem, groups, images, desc_element_straight_double, desc_element_edge_double, desc_element_t_double, desc_element_cross_double, desc_element_end_double)
+		-- TODO: Remove this evil sorcery
+         technic_cnc.register_element_straight_double(recipeitem, groups, images, desc_element_straight_double)
+         technic_cnc.register_element_edge_double(recipeitem, groups, images, desc_element_edge_double)
+         technic_cnc.register_element_t_double(recipeitem, groups, images, desc_element_t_double)
+         technic_cnc.register_element_cross_double(recipeitem, groups, images, desc_element_cross_double)
+         technic_cnc.register_element_end_double(recipeitem, groups, images, desc_element_end_double)
+end
+