From dd65a68ce9f494717faffc98c45814f9a9d67fa4 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Tue, 15 Jul 2014 18:29:36 +0100
Subject: [PATCH 1/5] Add centrifuge

The centrifuge, currently only existing in an MV variety, is a machine
that separates a mixed substance into its constituents.  Currently the
main use is to reverse alloying of metals.  The alloy separation recipes
intentionally only operate on the dust form of metals, making this less
convenient than the original alloying.  It also only recovers metal
constituents, not the carbon that went into cast iron or carbon steel.

This change incidentally generalises the technic recipe and
machine infrastructure to handle recipes with multiple outputs.
As unified_inventory's craft guide can't yet handle that, these recipes
are not registered there.
---
 technic/locale/template.txt                   |   2 ++
 technic/machines/MV/centrifuge.lua            |  16 +++++++++
 technic/machines/MV/init.lua                  |   1 +
 technic/machines/register/alloy_recipes.lua   |   5 ++-
 technic/machines/register/centrifuge.lua      |   8 +++++
 .../machines/register/centrifuge_recipes.lua  |  31 ++++++++++++++++++
 .../machines/register/compressor_recipes.lua  |   2 +-
 .../machines/register/extractor_recipes.lua   |   2 +-
 technic/machines/register/grinder_recipes.lua |   2 +-
 technic/machines/register/init.lua            |   3 +-
 technic/machines/register/machine_base.lua    |  28 ++++++++++++----
 technic/machines/register/recipes.lua         |  28 +++++++++++-----
 .../textures/technic_mv_centrifuge_bottom.png | Bin 0 -> 674 bytes
 .../textures/technic_mv_centrifuge_front.png  | Bin 0 -> 686 bytes
 .../technic_mv_centrifuge_front_active.png    | Bin 0 -> 686 bytes
 .../textures/technic_mv_centrifuge_side.png   | Bin 0 -> 636 bytes
 .../textures/technic_mv_centrifuge_top.png    | Bin 0 -> 814 bytes
 17 files changed, 108 insertions(+), 20 deletions(-)
 create mode 100644 technic/machines/MV/centrifuge.lua
 create mode 100644 technic/machines/register/centrifuge.lua
 create mode 100644 technic/machines/register/centrifuge_recipes.lua
 create mode 100644 technic/textures/technic_mv_centrifuge_bottom.png
 create mode 100644 technic/textures/technic_mv_centrifuge_front.png
 create mode 100644 technic/textures/technic_mv_centrifuge_front_active.png
 create mode 100644 technic/textures/technic_mv_centrifuge_side.png
 create mode 100644 technic/textures/technic_mv_centrifuge_top.png

diff --git a/technic/locale/template.txt b/technic/locale/template.txt
index 43090df..3d18f3b 100644
--- a/technic/locale/template.txt
+++ b/technic/locale/template.txt
@@ -64,6 +64,7 @@ Controlled by Mesecon Signal =
 %s Battery Box = 
 %s Cable =
 %s CNC Machine =
+%s Centrifuge =
 %s Compressor =
 %s Extractor =
 %s Forcefield Emitter =
@@ -190,3 +191,4 @@ Alloy cooking =
 Grinding =
 Compressing =
 Extracting =
+Separating =
diff --git a/technic/machines/MV/centrifuge.lua b/technic/machines/MV/centrifuge.lua
new file mode 100644
index 0000000..5bf24bf
--- /dev/null
+++ b/technic/machines/MV/centrifuge.lua
@@ -0,0 +1,16 @@
+minetest.register_craft({
+	output = "technic:mv_centrifuge",
+	recipe = {
+		{ "technic:motor",          "technic:copper_plate",   "technic:diamond_drill_head" },
+		{ "technic:copper_plate",   "technic:machine_casing", "technic:copper_plate"       },
+		{ "pipeworks:one_way_tube", "technic:mv_cable0",      "pipeworks:mese_filter"      },
+	}
+})
+
+technic.register_centrifuge({
+	tier = "MV",
+	demand = { 8000, 7000, 6000 },
+	speed = 2,
+	upgrade = 1,
+	tube = 1,
+})
diff --git a/technic/machines/MV/init.lua b/technic/machines/MV/init.lua
index 74eb631..72a98b6 100644
--- a/technic/machines/MV/init.lua
+++ b/technic/machines/MV/init.lua
@@ -20,6 +20,7 @@ dofile(path.."/electric_furnace.lua")
 dofile(path.."/grinder.lua")
 dofile(path.."/extractor.lua")
 dofile(path.."/compressor.lua")
+dofile(path.."/centrifuge.lua")
 
 dofile(path.."/tool_workshop.lua")
 
diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua
index 3227739..6f2fc94 100644
--- a/technic/machines/register/alloy_recipes.lua
+++ b/technic/machines/register/alloy_recipes.lua
@@ -1,7 +1,10 @@
 
 local S = technic.getter
 
-technic.register_recipe_type("alloy", S("Alloy cooking"), 2)
+technic.register_recipe_type("alloy", {
+	description = S("Alloy cooking"),
+	input_size = 2,
+})
 
 function technic.register_alloy_recipe(data)
 	data.time = data.time or 6
diff --git a/technic/machines/register/centrifuge.lua b/technic/machines/register/centrifuge.lua
new file mode 100644
index 0000000..dd05977
--- /dev/null
+++ b/technic/machines/register/centrifuge.lua
@@ -0,0 +1,8 @@
+local S = technic.getter
+
+function technic.register_centrifuge(data)
+	data.typename = "separating"
+	data.machine_name = "centrifuge"
+	data.machine_desc = S("%s Centrifuge")
+	technic.register_base_machine(data)
+end
diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua
new file mode 100644
index 0000000..0f33c66
--- /dev/null
+++ b/technic/machines/register/centrifuge_recipes.lua
@@ -0,0 +1,31 @@
+local S = technic.getter
+
+technic.register_recipe_type("separating", {
+	description = S("Separating"),
+	output_size = 2,
+})
+
+function technic.register_separating_recipe(data)
+	data.time = data.time or 10
+	technic.register_recipe("separating", data)
+end
+
+local rubber_tree_planks = minetest.get_modpath("moretrees") and "moretrees:rubber_tree_planks" or "default:wood"
+
+local recipes = {
+	{ "technic:bronze_dust 4",             "technic:copper_dust 3",       "technic:tin_dust"      },
+	{ "technic:stainless_steel_dust 4",    "technic:wrought_iron_dust 3", "technic:chromium_dust" },
+	{ "technic:brass_dust 3",              "technic:copper_dust 2",       "technic:zinc_dust"     },
+	{ "moretrees:rubber_tree_trunk_empty", rubber_tree_planks.." 4",      "technic:raw_latex"     },
+	{ "moretrees:rubber_tree_trunk",       rubber_tree_planks.." 4",      "technic:raw_latex"     },
+}
+
+if minetest.get_modpath("bushes_classic") then
+	for _, berry in ipairs({ "blackberry", "blueberry", "gooseberry", "raspberry", "strawberry" }) do
+		table.insert(recipes, { "bushes:"..berry.."_bush", "default:stick 20", "bushes:"..berry.." 4" })
+	end
+end
+
+for _, data in pairs(recipes) do
+	technic.register_separating_recipe({ input = { data[1] }, output = { data[2], data[3] } })
+end
diff --git a/technic/machines/register/compressor_recipes.lua b/technic/machines/register/compressor_recipes.lua
index 73282cf..5c5fe91 100644
--- a/technic/machines/register/compressor_recipes.lua
+++ b/technic/machines/register/compressor_recipes.lua
@@ -1,7 +1,7 @@
 
 local S = technic.getter
 
-technic.register_recipe_type("compressing", S("Compressing"))
+technic.register_recipe_type("compressing", { description = S("Compressing") })
 
 function technic.register_compressor_recipe(data)
 	data.time = data.time or 4
diff --git a/technic/machines/register/extractor_recipes.lua b/technic/machines/register/extractor_recipes.lua
index d4f8269..41cf56d 100644
--- a/technic/machines/register/extractor_recipes.lua
+++ b/technic/machines/register/extractor_recipes.lua
@@ -1,7 +1,7 @@
 
 local S = technic.getter
 
-technic.register_recipe_type("extracting", S("Extracting"))
+technic.register_recipe_type("extracting", { description = S("Extracting") })
 
 function technic.register_extractor_recipe(data)
 	data.time = data.time or 4
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index 4426f5c..df69665 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -1,7 +1,7 @@
 
 local S = technic.getter
 
-technic.register_recipe_type("grinding", S("Grinding"))
+technic.register_recipe_type("grinding", { description = S("Grinding") })
 
 function technic.register_grinder_recipe(data)
 	data.time = data.time or 3
diff --git a/technic/machines/register/init.lua b/technic/machines/register/init.lua
index 55c1f8b..3cf373d 100644
--- a/technic/machines/register/init.lua
+++ b/technic/machines/register/init.lua
@@ -19,6 +19,7 @@ dofile(path.."/alloy_recipes.lua")
 dofile(path.."/grinder_recipes.lua")
 dofile(path.."/extractor_recipes.lua")
 dofile(path.."/compressor_recipes.lua")
+dofile(path.."/centrifuge_recipes.lua")
 
 -- Machines
 dofile(path.."/alloy_furnace.lua")
@@ -26,4 +27,4 @@ dofile(path.."/electric_furnace.lua")
 dofile(path.."/grinder.lua")
 dofile(path.."/extractor.lua")
 dofile(path.."/compressor.lua")
-
+dofile(path.."/centrifuge.lua")
diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua
index 83c8740..6972b9c 100644
--- a/technic/machines/register/machine_base.lua
+++ b/technic/machines/register/machine_base.lua
@@ -17,7 +17,7 @@ local tube = {
 
 function technic.register_base_machine(data)
 	local typename = data.typename
-	local numitems = technic.recipes[typename].numitems
+	local input_size = technic.recipes[typename].input_size
 	local machine_name = data.machine_name
 	local machine_desc = data.machine_desc
 	local tier = data.tier
@@ -35,7 +35,7 @@ function technic.register_base_machine(data)
 
 	local formspec =
 		"invsize[8,9;]"..
-		"list[current_name;src;"..(4-numitems)..",1;"..numitems..",1;]"..
+		"list[current_name;src;"..(4-input_size)..",1;"..input_size..",1;]"..
 		"list[current_name;dst;5,1;2,2;]"..
 		"list[current_player;main;0,5;8,4;]"..
 		"label[0,0;"..machine_desc:format(tier).."]"
@@ -91,10 +91,26 @@ function technic.register_base_machine(data)
 			meta:set_int("src_time", meta:get_int("src_time") + 1)
 			if meta:get_int("src_time") >= result.time / data.speed then
 				meta:set_int("src_time", 0)
-				local result_stack = ItemStack(result.output)
-				if inv:room_for_item("dst", result_stack) then
+				local output = result.output
+				if type(output) ~= "table" then output = { output } end
+				local output_stacks = {}
+				for _, o in ipairs(output) do
+					table.insert(output_stacks, ItemStack(o))
+				end
+				local room_for_output = true
+				inv:set_size("dst_tmp", inv:get_size("dst"))
+				inv:set_list("dst_tmp", inv:get_list("dst"))
+				for _, o in ipairs(output_stacks) do
+					if not inv:room_for_item("dst_tmp", o) then
+						room_for_output = false
+						break
+					end
+					inv:add_item("dst_tmp", o)
+				end
+				if room_for_output then
 					inv:set_list("src", result.new_input)
-					inv:add_item("dst", result_stack)
+					inv:set_list("dst", inv:get_list("dst_tmp"))
+				else
 				end
 			end
 		end
@@ -121,7 +137,7 @@ function technic.register_base_machine(data)
 			meta:set_int("tube_time",  0)
 			meta:set_string("formspec", formspec)
 			local inv = meta:get_inventory()
-			inv:set_size("src", numitems)
+			inv:set_size("src", input_size)
 			inv:set_size("dst", 4)
 			inv:set_size("upgrade1", 1)
 			inv:set_size("upgrade2", 1)
diff --git a/technic/machines/register/recipes.lua b/technic/machines/register/recipes.lua
index cff8ca1..1aba96b 100644
--- a/technic/machines/register/recipes.lua
+++ b/technic/machines/register/recipes.lua
@@ -1,15 +1,19 @@
 
-technic.recipes = {cooking = {numitems = 1}}
-function technic.register_recipe_type(typename, desc, numitems)
-	numitems = numitems or 1
-	if unified_inventory and unified_inventory.register_craft_type then
+technic.recipes = { cooking = { input_size = 1, output_size = 1 } }
+function technic.register_recipe_type(typename, origdata)
+	local data = {}
+	for k, v in pairs(origdata) do data[k] = v end
+	data.input_size = data.input_size or 1
+	data.output_size = data.output_size or 1
+	if unified_inventory and unified_inventory.register_craft_type and data.output_size == 1 then
 		unified_inventory.register_craft_type(typename, {
-			description = desc,
-			height = numitems,
+			description = data.description,
+			height = data.input_size,
 			width = 1,
 		})
 	end
-	technic.recipes[typename] = {numitems = numitems, recipes = {}}
+	data.recipes = {}
+	technic.recipes[typename] = data
 end
 
 local function get_recipe_index(items)
@@ -26,7 +30,13 @@ local function register_recipe(typename, data)
 	for i, stack in ipairs(data.input) do
 		data.input[i] = ItemStack(stack):to_string()
 	end
-	data.output = ItemStack(data.output):to_string()
+	if type(data.output) == "table" then
+		for i, v in ipairs(data.output) do
+			data.output[i] = ItemStack(data.output[i]):to_string()
+		end
+	else
+		data.output = ItemStack(data.output):to_string()
+	end
 	
 	local recipe = {time = data.time, input = {}, output = data.output}
 	local index = get_recipe_index(data.input)
@@ -35,7 +45,7 @@ local function register_recipe(typename, data)
 	end
 	
 	technic.recipes[typename].recipes[index] = recipe
-	if unified_inventory then
+	if unified_inventory and technic.recipes[typename].output_size == 1 then
 		unified_inventory.register_craft({
 			type = typename,
 			output = data.output,
diff --git a/technic/textures/technic_mv_centrifuge_bottom.png b/technic/textures/technic_mv_centrifuge_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dcd40fd609eb37348c3bc0d5b22577f72e01ac7
GIT binary patch
literal 674
zcmV;T0$u%yP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4zU0L4zU58j33$n000McNliru-2w#<BQ8csJCFbX0xwBK
zK~y-6Ws|*%m1huupZWRz_N>@!p;w^f267wrHdY};(guPAu}}+3LBu{qnviR<G7t!?
z=j{1@-kGuZ$Re9=24;p~o@eCn{Z*l07ag?*?|yjAPal3oOu;}eoc8xjoEv_>M+POX
z8{&fYii-;rWJ_vEj;9USbIwWL1bV*%6Qnb038YsL$X0kB8}y0-IvMlLH5G;SMu|{s
zKoq$IVnVf~S|P3=h017q!In_)_`64-N^OA-igZf*cf~I|swHBIjtUCmhTEkRr-q17
zTaa1&{>yvRU|v>G!xg@qPe>{cA6zk?ZYb}_HSjzK;<~SD%BN4CdG+QuVml!H5lqRm
zGrIBe^-G>Se})~LoO3^9t$Xm_kjq1dRipHX<wU0|<`bba)6ik}I@&)AD3FE9ppYPg
z(mj|M#-54^x(?z@HYf8)4Z<?7#Bsx~Mg+hFzl-d=Y^>JP#{xAHYoko4+7XM$Epi<c
zttiwL=?$`QF+7gMxUoq?ea1$?m!A3NdZ)D|IvLdpzeP4VSw(5$!v#$o#uJ-$P)>}w
zBaR|T%oRF8{`~8YY6)a84m~Y`Z}SY$-jKF29xizD{Mjy96txEa^u>?(y`8DpZdWCU
z>2BSYV1iA~$DiMFcViWSSOVz`08DqOT40xs^osi4bY3=u1XJ3V4FpsVj!q6)R2AAQ
zsGy^BD_JCk;9|rv5cXfF0<Enelg#>`BzGk%-LIdm5EVp(uMvn;K7w!EUjP6A07*qo
IM6N<$g89%VeE<Le

literal 0
HcmV?d00001

diff --git a/technic/textures/technic_mv_centrifuge_front.png b/technic/textures/technic_mv_centrifuge_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..e278a330dcba2288ea778f752e9a4ae6b810b577
GIT binary patch
literal 686
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l(-$>
z6XMEkF2Zdo!sjf>Yb&;C+xiU~)@<6mX4RTy{NB>sCc+%r{5)2oypG~r#=<<-qCEEE
z+-4%&R-)Xd!mHM;T(@E6!sYW8EnUEEDaxfU$Ym<bYcI}YDavgj!fPkaV=cz(AkJwZ
zIB&_^<*OGhSUhLSjOjgnom+Nn*u8hl=1r@3?8LaO#CR-48nU&D;?+tL)!GYnd8~kr
zk!Z=&k>_C8KGT-RR*c(Rn8!wp+f0~4i=R_Zkk>}EI$e{?Sg5y5zpGfUE>o*HSDVjC
zf>R$TCB|hW#AP7JV<-Oq|NqE|KOO_U$(ZEr?&9%*>B=i0hqJ&VvKUBvfU(=jY&#(1
zpr?yth{R>vbD7eO4ic>ooxdrjdZ+n(TkFJi^ZJkf|4;OE+wFf}I#1d|Won4k<g-t?
zmqau%O`T%udR6;s)LuuPyAGFCbWh#dlT_-l{knXDg_Qp?<J*OIckYfb;_DBL&RJ7q
z&k>fri}7aLvAp_%+WVY+a`}q+6NQ<J&pki=_1pa);;jdoG@PtlK58FWFX7cLl8|=)
z<YUR8$R62=+d69}gzprb`F7=>W2c{lRM_m?cxRT@74y_XpT8cJKD+hP=fZ!C^H0h4
zWG<Vu9q1X=64!{5l*E!$tK_0oAjM#0U}&OiV6JOu8e(W+Wn^e&V5V&VBn_;tKh8qY
ckei>9nO2EggLhZ-HJ}CtPgg&ebxsLQ00)2Mx&QzG

literal 0
HcmV?d00001

diff --git a/technic/textures/technic_mv_centrifuge_front_active.png b/technic/textures/technic_mv_centrifuge_front_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cef9123ecb2a436bc1e2afa85f49492f793a458
GIT binary patch
literal 686
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l(-$>
z6XMEkF2Zdo!sjf>Yb&;C+xiU~)@<6mX4RTy{NB>sCc+%r{5)2oypG~r#=<<-qCEEE
z+-4%&R-)Xd!mHM;T(@E6!sYW8EnUEEDaxfU$Ym<bYcI}YDavgj!fPkaV=cz(AkJwZ
zIB&_^<*OGhSUhLSjOjgnom+Nn*u8hl=1r@3?8LaO#CR-48nU&D;?+tL)!GYnd8~kr
zk!Z=&k?&yGKGT-RR*c(Rn8!wp+f0~4i=R_Zkk>}EI$e{?Sg5y5zpGfUE>o*HSDVjC
zf>R$TCB|hW#AP7JV<-Oq|NqaM-*N)I$(ZEr?&9%*>B=i0hqJ&VvKUBvfU(=jY&#(1
zpr?yth{R>vbD7eO4ic>ooxdrjdZ+n(TkFJi^ZJkf|4;OE+wFf}I#1d|Won4k<g-t?
zmqau%O`T%udR6;s)LuuPyAGFCbWh#dlT_-l{knXDg_Qp?<J*OIckYfb;_DBL&RJ7q
z&k>fri}7aLvAp_%+WVY+a`}q+6NQ<J&pki=_1pa);;jdoG@PtlK58FWFX7cLl8|=)
z<YUR8$R62=+d69}gzprb`F7=>W2c{lRM_m?cxRT@74y_XpT8cJKD+hP=fZ!C^H0h4
zWG<Vu9q1X=64!{5l*E!$tK_0oAjM#0U}&OiV6JOu8e(W+Wn^e&WT0(eXk}m^t#nZr
eMMG|WN@iLmZVg%WnG=B;7(8A5T-G@yGywotJLAIu

literal 0
HcmV?d00001

diff --git a/technic/textures/technic_mv_centrifuge_side.png b/technic/textures/technic_mv_centrifuge_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeef44aabd214270a7d703725c118bbd4faa3a3d
GIT binary patch
literal 636
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5l-L{K
z6XMEkF2Zdo!sjf>Yb&;C+xiU~)@<6mX4RTy{NB>sCc+%r{5)2oypG~r#=<<-qCEEE
z+-4%&R-)Xd!mHM;T(@E6!sYW8EnUEEDaxfU$Ym<bYcI}YDavgj!fPkaV=cz(AkJwZ
zIB&_^<*OGhSUhLSjOjgnom+Nn*u8hl=1r@3?8LaO#CU+VJ4tZr3-a2CahnPASOFa)
z!DS%GV=KmOF3e*i#-YW}sRxu5<uVrH0g~n-Tt-4XcH;m4|JVC2rVR85W0JSKi=Af*
z!($+av%n*=n1O+BBM39j>5;z$6kO}+;us=v+4tOYp(X<fmy1_#7)Wh&^5OZ`#?`TR
z&;RU`$1{%Iw=Vw1)T*RCRr~6!;OD(+5-j;UeYRNNjjKPfcN=^Br-hf4FLNHNF`9dJ
zW5l{^vvYSm{_VUZDR)AK=p@CyODjU=9ymX-eCItIqmrby0;am_7mn@dUv660AL-ce
zMldC%zmjoZzo2AD!+-beJ$EL*WnP=I=ZVJq!`syrmF>J4KZaeI{5|rp|ID|)8J?Vw
z>X>I!coOJv)e_f;l9a@fRIB8oR3OD*WMF8bYhbQxXc}T@YGrI{Wn`&sU}$Av!1%e_
f3PnS1eoAIqC2kD`>x|og8W=oX{an^LB{Ts5{zlCf

literal 0
HcmV?d00001

diff --git a/technic/textures/technic_mv_centrifuge_top.png b/technic/textures/technic_mv_centrifuge_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..813bbf8d3c32ece626f84c455fbdcb97048e8a10
GIT binary patch
literal 814
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5)TbZd
z6XMEkCc<MQ%4IIX=PJpiFUVsn#%n9aZ6eI;AkJeY%4ICHaQQrLa}jO}5guzX9&1q^
zJ8>RMQ9fr0UVCvK8!>J(VQx#&MN1cO>Iw4Nh;jq97zlEi3Uiwa^H_?^TQZl&N`zA%
zC?&>aB*beczI^o}ZYwc9Cy8|%R<2sNa@Cq;n>Mf6uwl)nZR<C0TD5!c7H(5vStVIX
zbwx2{F;O)UQB_${b?GfTHt^VqNlFV#s0oWni%ZG#OQ=c8$jkKfb&AT#OUp?}OG!&e
zi;K!hNT`WTnK7NmUYyraoZnkoT3S+6Q9?>uSV~b?Oh!ynU39_XIoy^ae9n?Gasr|<
z!cuZFGOGL%a!OJPB9ihVVp8(r3c}*bqM}lgvT`z<27<gGpGt6O^K%&s|NsBru*+d0
zD9n?*-Ca@+-P*wk<Zu>vL>4nJ@NEQP#yLImw}66gJzX3_BrfZoOAl^#5NUn5SgmDh
z>UCcxjY$H$8C)tGkI88t>)ZSN|9|->=YBk_vn)=ZCoUl=d;00trgO)5^SBr-7oJ(9
zv2jzX_2l4f-I@L?_N)@|4gH#(>YtQ$Eyy(Z!!Gfb;;WTyZkw+z>we^SoyUcLixhXa
z_i63bf8S*DZn1hTJv;igHFN(|ktMeu|9f}u-@%80hx!&evK^lM;meypk3MPb-FLAh
zAh4>s{Qrj^B0-8PG%D*VYpef%SSb)9;{G;lbE3svKbgj^Un&2^m8M5BZ~E$=b~Ui^
z%$k-r`v1=6TxUDKX3CpG{L=r5-tsR_ReJpO_DfK5R4s9hC`m~yNwrEYN(E93Mh1o^
zx(4RDhNdBgrdFoLR;EVU28LD!25)BN+(prlo1c=IR*74~+~Zdgff^V*UHx3vIVCg!
E031R7c>n+a

literal 0
HcmV?d00001


From 9f0b41fe713e0ff973c09e2f8e52624d40551ff9 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Sat, 26 Jul 2014 19:03:07 +0100
Subject: [PATCH 2/5] Make technic_worldgen loadable before technic

There was a small amount of dependency of technic_worldgen on the
technic mod, for configuration loading and the top-level "technic" table.
Resolve that by sharing the configuration and top-level table between the
two mods.  This means that technic_worldgen can be loaded before technic,
permitting other mods to depend on it without depending on technic.
---
 technic/config.lua           |  9 +--------
 technic/init.lua             |  2 +-
 technic_worldgen/config.lua  | 15 +++++++++++++++
 technic_worldgen/depends.txt |  1 -
 technic_worldgen/init.lua    |  2 ++
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 technic_worldgen/config.lua

diff --git a/technic/config.lua b/technic/config.lua
index 1dfce66..e512bee 100644
--- a/technic/config.lua
+++ b/technic/config.lua
@@ -1,7 +1,4 @@
-
-local worldpath = minetest.get_worldpath()
-
-technic.config = Settings(worldpath.."/technic.conf")
+technic.config = technic.config or Settings(minetest.get_worldpath().."/technic.conf")
 
 local conf_table = technic.config:to_table()
 
@@ -9,9 +6,6 @@ local defaults = {
 	enable_mining_drill = "true",
 	enable_mining_laser = "true",
 	enable_flashlight = "false",
-	enable_rubber_tree_generation = "true",
-	enable_marble_generation = "true",
-	enable_granite_generation = "true",
 	enable_wind_mill = "false",
 	enable_corium_griefing = "true",
 }
@@ -21,4 +15,3 @@ for k, v in pairs(defaults) do
 		technic.config:set(k, v)
 	end
 end
-
diff --git a/technic/init.lua b/technic/init.lua
index 2349029..fcd1cd9 100644
--- a/technic/init.lua
+++ b/technic/init.lua
@@ -2,7 +2,7 @@
 -- namespace: technic
 -- (c) 2012-2013 by RealBadAngel <mk@realbadangel.pl>
 
-technic = {}
+technic = technic or {}
 
 local load_start = os.clock()
 local modpath = minetest.get_modpath("technic")
diff --git a/technic_worldgen/config.lua b/technic_worldgen/config.lua
new file mode 100644
index 0000000..4ac748c
--- /dev/null
+++ b/technic_worldgen/config.lua
@@ -0,0 +1,15 @@
+technic.config = technic.config or Settings(minetest.get_worldpath().."/technic.conf")
+
+local conf_table = technic.config:to_table()
+
+local defaults = {
+	enable_granite_generation = "true",
+	enable_marble_generation = "true",
+	enable_rubber_tree_generation = "true",
+}
+
+for k, v in pairs(defaults) do
+	if conf_table[k] == nil then
+		technic.config:set(k, v)
+	end
+end
diff --git a/technic_worldgen/depends.txt b/technic_worldgen/depends.txt
index a72ad90..ac858d0 100644
--- a/technic_worldgen/depends.txt
+++ b/technic_worldgen/depends.txt
@@ -1,4 +1,3 @@
 default
-technic
 intllib?
 mg?
diff --git a/technic_worldgen/init.lua b/technic_worldgen/init.lua
index 7e80fd3..73e9fc7 100644
--- a/technic_worldgen/init.lua
+++ b/technic_worldgen/init.lua
@@ -1,5 +1,6 @@
 local modpath = minetest.get_modpath("technic_worldgen")
 
+technic = technic or {}
 technic.worldgen = {}
 if intllib then
 	technic.worldgen.gettext = intllib.Getter()
@@ -7,6 +8,7 @@ else
 	technic.worldgen.gettext = function(s) return s end
 end
 
+dofile(modpath.."/config.lua")
 dofile(modpath.."/nodes.lua")
 dofile(modpath.."/oregen.lua")
 dofile(modpath.."/crafts.lua")

From d60e3fe9399dc57aa901e301c0d8e8aa022565d8 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Sat, 26 Jul 2014 19:33:48 +0100
Subject: [PATCH 3/5] Reduce dependencies of technic_chests

technic_chests was depending on the technic mod, for the top-level
"technic" table and the technic.swap_node function.  Resolve that by
sharing the top-level table and inlining the one use of the function.
It was also depending on technic_worldgen, for the definitions of
cast iron and wrought iron.  Make the use of cast iron conditional on
technic_worldgen, falling back to default "steel".  Change the use of
wrought iron to directly use default "steel", to which it is aliased
anyway.
---
 technic_chests/copper_chest.lua  |  2 +-
 technic_chests/depends.txt       |  3 ---
 technic_chests/gold_chest.lua    |  2 +-
 technic_chests/init.lua          |  1 +
 technic_chests/iron_chest.lua    | 20 +++++++++++++-------
 technic_chests/mithril_chest.lua |  2 +-
 technic_chests/register.lua      |  4 +++-
 technic_chests/silver_chest.lua  |  2 +-
 8 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/technic_chests/copper_chest.lua b/technic_chests/copper_chest.lua
index 2d58379..d40284b 100644
--- a/technic_chests/copper_chest.lua
+++ b/technic_chests/copper_chest.lua
@@ -19,7 +19,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:copper_locked_chest 1',
 	recipe = {
-		{'technic:wrought_iron_ingot'},
+		{'default:steel_ingot'},
 		{'technic:copper_chest'},
 	}
 })
diff --git a/technic_chests/depends.txt b/technic_chests/depends.txt
index 2e151fa..4d04e9d 100644
--- a/technic_chests/depends.txt
+++ b/technic_chests/depends.txt
@@ -1,6 +1,3 @@
 default
-technic
-technic_worldgen
 pipeworks
 intllib?
-
diff --git a/technic_chests/gold_chest.lua b/technic_chests/gold_chest.lua
index 386d1c7..161d8fe 100644
--- a/technic_chests/gold_chest.lua
+++ b/technic_chests/gold_chest.lua
@@ -20,7 +20,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:gold_locked_chest',
 	recipe = {
-		{'technic:wrought_iron_ingot'},
+		{'default:steel_ingot'},
 		{'technic:gold_chest'},
 	}
 })
diff --git a/technic_chests/init.lua b/technic_chests/init.lua
index 99af8ad..5fa96ff 100644
--- a/technic_chests/init.lua
+++ b/technic_chests/init.lua
@@ -4,6 +4,7 @@
 
 modpath = minetest.get_modpath("technic_chests")
 
+technic = technic or {}
 technic.chests = {}
 
 dofile(modpath.."/common.lua")
diff --git a/technic_chests/iron_chest.lua b/technic_chests/iron_chest.lua
index aa02533..90434bb 100644
--- a/technic_chests/iron_chest.lua
+++ b/technic_chests/iron_chest.lua
@@ -1,26 +1,32 @@
+local cast_iron_ingot
+if minetest.get_modpath("technic_worldgen") then
+	cast_iron_ingot = "technic:cast_iron_ingot"
+else
+	cast_iron_ingot = "default:steel_ingot"
+end
 
 minetest.register_craft({
 	output = 'technic:iron_chest 1',
 	recipe = {
-		{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'},
-		{'technic:cast_iron_ingot','default:chest','technic:cast_iron_ingot'},
-		{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'},
+		{cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
+		{cast_iron_ingot,'default:chest',cast_iron_ingot},
+		{cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
 	}
 })
 
 minetest.register_craft({
 	output = 'technic:iron_locked_chest 1',
 	recipe = {
-		{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'},
-		{'technic:cast_iron_ingot','default:chest_locked','technic:cast_iron_ingot'},
-		{'technic:cast_iron_ingot','technic:cast_iron_ingot','technic:cast_iron_ingot'},
+		{cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
+		{cast_iron_ingot,'default:chest_locked',cast_iron_ingot},
+		{cast_iron_ingot,cast_iron_ingot,cast_iron_ingot},
 	}
 })
 
 minetest.register_craft({
 	output = 'technic:iron_locked_chest 1',
 	recipe = {
-		{'technic:wrought_iron_ingot'},
+		{'default:steel_ingot'},
 		{'technic:iron_chest'},
 	}
 })
diff --git a/technic_chests/mithril_chest.lua b/technic_chests/mithril_chest.lua
index 69e7f17..bd2b981 100644
--- a/technic_chests/mithril_chest.lua
+++ b/technic_chests/mithril_chest.lua
@@ -19,7 +19,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:mithril_locked_chest 1',
 	recipe = {
-		{'technic:wrought_iron_ingot'},
+		{'default:steel_ingot'},
 		{'technic:mithril_chest'},
 	}
 })
diff --git a/technic_chests/register.lua b/technic_chests/register.lua
index 17b1a0e..0344c2c 100644
--- a/technic_chests/register.lua
+++ b/technic_chests/register.lua
@@ -49,7 +49,9 @@ end
 local function check_color_buttons(pos, meta, chest_name, fields)
 	for i = 1, 16 do
 		if fields["color_button"..i] then
-			technic.swap_node(pos, chest_name..colorid_to_postfix(i))
+			local node = minetest.get_node(pos)
+			node.name = chest_name..colorid_to_postfix(i)
+			minetest.swap_node(pos, node)
 			meta:set_string("color", i)
 			return
 		end
diff --git a/technic_chests/silver_chest.lua b/technic_chests/silver_chest.lua
index 0370488..505156a 100644
--- a/technic_chests/silver_chest.lua
+++ b/technic_chests/silver_chest.lua
@@ -19,7 +19,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = 'technic:silver_locked_chest',
 	recipe = {
-		{'technic:wrought_iron_ingot'},
+		{'default:steel_ingot'},
 		{'technic:silver_chest'},
 	}
 })

From b0faa708739280d435de149d753a26c9cc45f16f Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Sun, 27 Jul 2014 02:48:08 +0100
Subject: [PATCH 4/5] Uranium enrichment via centrifuge

Replacing the extractor-based system, uranium to be used as reactor fuel
must now be enriched in stages using the centrifuge.  Uranium metal can
exist at 36 levels of fissile content, from 0.0% to 3.5% in steps of 0.1%.
One round of centrifuging splits two dust of a particular grade in to one
dust each of the two neighbouring grades.  Uranium of each grade can exist
as dust, ingot, and block, with all the regular metal processes to convert
between them.  Uranium from ore exists in lump form, and is 0.7% fissle.
The blocks are radioactive to a degree dependent on fissile content.
Thus the chemical refinement and processing of uranium now follows the
standard pattern for metals, and is orthogonal to isotopic enrichment.
Each form of uranium (dust, ingot, block) intentionally looks identical
regardless of fissile grade.

If technic_worldgen is used alone, it defines only one grade of uranium
(as before), but defines it in the regular metal pattern, with lump, ingot
produced by cooking lump, and block crafted from ingots.  It identifies
the metal only as "uranium".  The multiple grades of uranium are defined
by the technic mod, which identifies each grade as "N.N%-fissile
uranium".  The single grade that was registered by technic_worldgen
is redefined to be described specifically as "0.7%-fissile uranium".
For the redefinition to work, technic_worldgen must load before technic,
so technic now declares a dependency on technic_worldgen.

Each fuel rod is made from five 3.5%-fissile ingots, each of which in
turn requires one to start with five 0.7%-fissile dust, so each fuel rod
is now derived from 12.5 uranium lumps (or 25 if the lumps were first
cooked rather than being ground).  This replaces the 20 lumps required
by the former recipes.  After setting up and priming the centrifuge
cascade, enriching a full set of fuel for the reactor (six fuel rods)
takes 14700 centrifuge operations.  It's intended to be a practical
necessity to automate the centrifuge.  In the absence of EU upgrades
for the centrifuges, these operations consume 5.88e8 EU, about 0.97%
of the 6.048e10 EU that the fuel set will produce in the reactor.
The intent is that, in this respect as in others, operating a reactor
should carry a very high up-front cost, but ultimately be very profitable.
---
 technic/depends.txt                           |   1 +
 technic/items.lua                             |  39 +++++++++++++++---
 technic/legacy.lua                            |   1 +
 technic/locale/de.txt                         |   3 ++
 technic/locale/es.txt                         |   3 ++
 technic/locale/it.txt                         |   3 ++
 technic/locale/template.txt                   |   3 ++
 technic/machines/HV/nuclear_reactor.lua       |   2 +-
 .../machines/register/centrifuge_recipes.lua  |  15 +++++++
 .../machines/register/compressor_recipes.lua  |   2 +-
 .../machines/register/extractor_recipes.lua   |   3 --
 technic/machines/register/grinder_recipes.lua |  36 ++++++++++++++++
 technic/textures/technic_enriched_uranium.png | Bin 301 -> 0 bytes
 technic/textures/technic_uranium_dust.png     | Bin 0 -> 229 bytes
 .../technicx32/technic_uranium_dust.png       | Bin 0 -> 1112 bytes
 technic_worldgen/crafts.lua                   |  22 ++++++++--
 technic_worldgen/locale/de.txt                |   3 +-
 technic_worldgen/locale/template.txt          |   3 +-
 technic_worldgen/nodes.lua                    |   4 +-
 .../textures/technic_uranium_ingot.png        | Bin 0 -> 300 bytes
 ...c_uranium.png => technic_uranium_lump.png} | Bin
 21 files changed, 125 insertions(+), 18 deletions(-)
 delete mode 100644 technic/textures/technic_enriched_uranium.png
 create mode 100644 technic/textures/technic_uranium_dust.png
 create mode 100644 technic/textures/technicx32/technic_uranium_dust.png
 create mode 100644 technic_worldgen/textures/technic_uranium_ingot.png
 rename technic_worldgen/textures/{technic_uranium.png => technic_uranium_lump.png} (100%)

diff --git a/technic/depends.txt b/technic/depends.txt
index eec4a14..c2671c5 100644
--- a/technic/depends.txt
+++ b/technic/depends.txt
@@ -1,5 +1,6 @@
 default
 pipeworks
+technic_worldgen
 bucket?
 mesecons_mvps?
 intllib?
diff --git a/technic/items.lua b/technic/items.lua
index a902947..b974b95 100644
--- a/technic/items.lua
+++ b/technic/items.lua
@@ -11,11 +11,6 @@ minetest.register_craftitem( "technic:doped_silicon_wafer", {
 	inventory_image = "technic_doped_silicon_wafer.png",
 })
 
-minetest.register_craftitem("technic:enriched_uranium", {
-	description = S("Enriched Uranium"),
-	inventory_image = "technic_enriched_uranium.png",
-})
-
 minetest.register_craftitem("technic:uranium_fuel", {
 	description = S("Uranium Fuel"),
 	inventory_image = "technic_uranium_fuel.png",
@@ -163,3 +158,37 @@ minetest.register_node("technic:machine_casing", {
 	tiles = {"technic_machine_casing.png"},
 	sounds = default.node_sound_stone_defaults(),
 })
+
+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
+	local ingot = "technic:uranium"..psuffix.."_ingot"
+	local block = "technic:uranium"..psuffix.."_block"
+	local ov = p == 7 and minetest.override_item or nil;
+	(ov or minetest.register_craftitem)(ingot, {
+		description = string.format(S("%.1f%%-Fissile Uranium Ingot"), p/10),
+		inventory_image = "technic_uranium_ingot.png",
+		groups = {uranium_ingot=1, not_in_creative_inventory=nici},
+	});
+	(ov or minetest.register_node)(block, {
+		description = string.format(S("%.1f%%-Fissile Uranium Block"), p/10),
+		tiles = {"technic_uranium_block.png"},
+		is_ground_content = true,
+		groups = {uranium_block=1, not_in_creative_inventory=nici, cracky=1, level=2, radioactive=math.floor(math.sqrt(p) + 0.5)},
+		sounds = default.node_sound_stone_defaults(),
+	});
+	if not ov then
+		minetest.register_craft({
+			output = block,
+			recipe = {
+				{ingot, ingot, ingot},
+				{ingot, ingot, ingot},
+				{ingot, ingot, ingot},
+			},
+		})
+		minetest.register_craft({
+			output = ingot.." 9",
+			recipe = {{block}},
+		})
+	end
+end
diff --git a/technic/legacy.lua b/technic/legacy.lua
index c835937..8360a71 100644
--- a/technic/legacy.lua
+++ b/technic/legacy.lua
@@ -29,6 +29,7 @@ technic.legacy_nodenames = {
 	["technic:generator"]        = "technic:lv_generator",
 	["technic:generator_active"] = "technic:lv_generator_active",
 	["technic:iron_dust"] = "technic:wrought_iron_dust",
+	["technic:enriched_uranium"] = "technic:uranium35_ingot",
 }
 
 for old, new in pairs(technic.legacy_nodenames) do
diff --git a/technic/locale/de.txt b/technic/locale/de.txt
index 984296b..1a1e82a 100644
--- a/technic/locale/de.txt
+++ b/technic/locale/de.txt
@@ -29,6 +29,8 @@ Graphite = Graphit
 Carbon Cloth = Kohlefasergewebe
 Raw Latex = Rohlatex
 Rubber Fiber = Gummifaser
+%.1f%%-Fissile Uranium Ingot =
+%.1f%%-Fissile Uranium Block =
 
 ## Machine misc
 Machine cannot be removed because it is not empty = Die Maschine kann nicht entfernt werden, weil sie noch nicht leer ist.
@@ -162,6 +164,7 @@ Talinite = Talinite
 Tin = Zinn
 Wrought Iron = Schmiedeeisen
 Zinc = Zink
+%.1f%%-Fissile Uranium =
 
 ## Tools
 RE Battery = Akkubatterie
diff --git a/technic/locale/es.txt b/technic/locale/es.txt
index 2323abc..9d58ebd 100644
--- a/technic/locale/es.txt
+++ b/technic/locale/es.txt
@@ -29,6 +29,8 @@ Graphite = Grafito
 Carbon Cloth = Tela de Carbon
 Raw Latex = Latex Crudo
 Rubber Fiber = Fibra de Hule
+%.1f%%-Fissile Uranium Ingot =
+%.1f%%-Fissile Uranium Block =
 
 ## Machine misc
 Machine cannot be removed because it is not empty = La maquina no puede removerse porque no esta vacia
@@ -152,6 +154,7 @@ Talinite = Talinita
 Tin = Estanio
 Wrought Iron = Hierro Forjado
 Zinc = Zinc
+%.1f%%-Fissile Uranium =
 
 ## Tools
 RE Battery =
diff --git a/technic/locale/it.txt b/technic/locale/it.txt
index 70da24e..234a858 100644
--- a/technic/locale/it.txt
+++ b/technic/locale/it.txt
@@ -26,6 +26,8 @@ Graphite = Lastra in graffite
 Carbon Cloth = Fibra di carbonio
 Raw Latex = Latex grezzo
 Rubber Fiber = Fibra di gomma
+%.1f%%-Fissile Uranium Ingot =
+%.1f%%-Fissile Uranium Block =
 
 ## Machine misc
 Machine cannot be removed because it is not empty = La macchina non può essere rimossa perchè non è vuota
@@ -159,6 +161,7 @@ Talinite = Talinite
 Tin = Stagno
 Wrought Iron = Ferro Battuto
 Zinc = Zinco
+%.1f%%-Fissile Uranium =
 
 ## Tools
 RE Battery =
diff --git a/technic/locale/template.txt b/technic/locale/template.txt
index 3d18f3b..0d47974 100644
--- a/technic/locale/template.txt
+++ b/technic/locale/template.txt
@@ -29,6 +29,8 @@ Graphite =
 Carbon Cloth =
 Raw Latex =
 Rubber Fiber =
+%.1f%%-Fissile Uranium Ingot =
+%.1f%%-Fissile Uranium Block =
 
 ## Machine misc
 Machine cannot be removed because it is not empty =
@@ -167,6 +169,7 @@ Talinite =
 Tin =
 Wrought Iron =
 Zinc =
+%.1f%%-Fissile Uranium =
 
 ## Tools
 RE Battery =
diff --git a/technic/machines/HV/nuclear_reactor.lua b/technic/machines/HV/nuclear_reactor.lua
index e5d7a1b..c4587bb 100644
--- a/technic/machines/HV/nuclear_reactor.lua
+++ b/technic/machines/HV/nuclear_reactor.lua
@@ -493,7 +493,6 @@ local default_radiation_resistance_per_node = {
 	["technic:mineral_uranium"] = 71,
 	["technic:mineral_zinc"] = 19,
 	["technic:stainless_steel_block"] = 40,
-	["technic:uranium_block"] = 500,
 	["technic:zinc_block"] = 36,
 	["tnt:tnt"] = 11,
 	["tnt:tnt_burning"] = 11,
@@ -501,6 +500,7 @@ local default_radiation_resistance_per_node = {
 local default_radiation_resistance_per_group = {
 	concrete = 16,
 	tree = 3.4,
+	uranium_block = 500,
 	wood = 1.7,
 }
 local cache_radiation_resistance = {}
diff --git a/technic/machines/register/centrifuge_recipes.lua b/technic/machines/register/centrifuge_recipes.lua
index 0f33c66..7f252b6 100644
--- a/technic/machines/register/centrifuge_recipes.lua
+++ b/technic/machines/register/centrifuge_recipes.lua
@@ -20,6 +20,21 @@ local recipes = {
 	{ "moretrees:rubber_tree_trunk",       rubber_tree_planks.." 4",      "technic:raw_latex"     },
 }
 
+-- Refining uranium via centrifuge is intended to make it a practical
+-- necessity to set up an automated cascade of centrifuges.  Once the
+-- cascade has been primed, production of one 3.5%-fissile dust requires
+-- input of five 0.7%-fissile dust and 490 centrifuge operations, and
+-- produces four 0.0%-fissile dust as a byproduct.  The busiest stage
+-- of the cascade is the one taking 0.7%-fissile dust, which performs 28
+-- of the 490 operations.  The least busy is the one taking 3.4%-fissile
+-- dust, which performs 1 of the 490 operations.
+local function uranium_dust(p)
+	return "technic:uranium"..(p == 7 and "" or p).."_dust"
+end
+for p = 1, 34 do
+	table.insert(recipes, { uranium_dust(p).." 2", uranium_dust(p-1), uranium_dust(p+1) })
+end
+
 if minetest.get_modpath("bushes_classic") then
 	for _, berry in ipairs({ "blackberry", "blueberry", "gooseberry", "raspberry", "strawberry" }) do
 		table.insert(recipes, { "bushes:"..berry.."_bush", "default:stick 20", "bushes:"..berry.." 4" })
diff --git a/technic/machines/register/compressor_recipes.lua b/technic/machines/register/compressor_recipes.lua
index 5c5fe91..4fba03b 100644
--- a/technic/machines/register/compressor_recipes.lua
+++ b/technic/machines/register/compressor_recipes.lua
@@ -15,7 +15,7 @@ local recipes = {
 	{"default:copper_ingot 5",     "technic:copper_plate"},
 	{"technic:coal_dust 4",        "technic:graphite"},
 	{"technic:carbon_cloth",       "technic:carbon_plate"},
-	{"technic:enriched_uranium 4", "technic:uranium_fuel"},
+	{"technic:uranium35_ingot 5",  "technic:uranium_fuel"},
 }
 
 for _, data in pairs(recipes) do
diff --git a/technic/machines/register/extractor_recipes.lua b/technic/machines/register/extractor_recipes.lua
index 41cf56d..f752144 100644
--- a/technic/machines/register/extractor_recipes.lua
+++ b/technic/machines/register/extractor_recipes.lua
@@ -24,9 +24,6 @@ local recipes = {
 	{"technic:raw_latex",                 "technic:rubber 3"},
 	{"moretrees:rubber_tree_trunk_empty", "technic:rubber"},
 	{"moretrees:rubber_tree_trunk",       "technic:rubber"},
-	
-	-- Other
-	{"technic:uranium 5",                 "technic:enriched_uranium"},
 }
 
 for _, data in pairs(recipes) do
diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua
index df69665..6ab19e7 100644
--- a/technic/machines/register/grinder_recipes.lua
+++ b/technic/machines/register/grinder_recipes.lua
@@ -16,6 +16,7 @@ local recipes = {
 	{"default:gold_lump",       "technic:gold_dust 2"},
 	{"default:iron_lump",       "technic:wrought_iron_dust 2"},
 	{"technic:chromium_lump",   "technic:chromium_dust 2"},
+	{"technic:uranium_lump",    "technic:uranium_dust 2"},
 	{"technic:zinc_lump",       "technic:zinc_dust 2"},
 	
 	-- Other
@@ -87,6 +88,41 @@ if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then
 	register_dust("Talinite",        "glooptest:talinite_ingot")
 end
 
+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
+	local ingot = "technic:uranium"..psuffix.."_ingot"
+	local dust = "technic:uranium"..psuffix.."_dust"
+	minetest.register_craftitem(dust, {
+		description = S("%s Dust"):format(string.format(S("%.1f%%-Fissile Uranium"), p/10)),
+		inventory_image = "technic_uranium_dust.png",
+		on_place_on_ground = minetest.craftitem_place_item,
+		groups = {uranium_dust=1, not_in_creative_inventory=nici},
+	})
+	minetest.register_craft({
+		type = "cooking",
+		recipe = dust,
+		output = ingot,
+	})
+	technic.register_grinder_recipe({ input = {ingot}, output = dust })
+end
+
+local function uranium_dust(p)
+	return "technic:uranium"..(p == 7 and "" or p).."_dust"
+end
+for pa = 0, 34 do
+	for pb = pa+1, 35 do
+		local pc = (pa+pb)/2
+		if pc == math.floor(pc) then
+			minetest.register_craft({
+				type = "shapeless",
+				recipe = { uranium_dust(pa), uranium_dust(pb) },
+				output = uranium_dust(pc).." 2",
+			})
+		end
+	end
+end
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "technic:coal_dust",
diff --git a/technic/textures/technic_enriched_uranium.png b/technic/textures/technic_enriched_uranium.png
deleted file mode 100644
index 8759e658a949e5535e28c20b6e0e6fb9c78a21fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002=Nkl<ZILqac
zF>b;z6o$V9kfN;64W=v=EX<6(MrW3eOg%zJCT`HJho~wpzyM7mAt9AYh^lEsD$5d%
z-2vf>5ORR_AD`d%`8^x{en#QY+%0a+rE{kW%+wBm90h>qdQ7^HPNiTJ4o#|(lUj}X
zMUhhki_K-CR3&^QTb^%bPQ7^R5iAp>Dq%TYQS)80SO6TlzV@F)QN&fyqS<JjiG=><
z^(D5VTxi0Fx8D^8PrZ{@K8iB6V>w+NM7|3^77Gj83B+3Bw>>M^%(uMD4O(hjD}trJ
z&>siJZ+qlYlS_@38nKq8U}gH_z+B&V4F4lPts;AODdnNq00000NkvXXu0mjfp-g|+

diff --git a/technic/textures/technic_uranium_dust.png b/technic/textures/technic_uranium_dust.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c211dc7ae0c3cd1671dd8a14e3c654c2225c8fb
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP;k1Z
zi(`mI@7o?jp(X<nR&&EnrSuDK{Y!f<y=cvlk+OR4lKhmBLwR!l{d1CRdl{qO-L5n+
zHfB!v$NTm1G9~7F)*(|LZ~Jl6FXieKDJKR8mlM}5H+EY*x5zm+xlZNX`Ka4Bm>$eI
zEaB|M`QBDj)rn)zuX#!Jri+_bX?|UM%7~>c@jz7f)@e6f*F;W8)eiZ(yOU%2-J=XO
Z3`t^EtdBO%{0DR*gQu&X%Q~loCIGBKRigj^

literal 0
HcmV?d00001

diff --git a/technic/textures/technicx32/technic_uranium_dust.png b/technic/textures/technicx32/technic_uranium_dust.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8095c3696ccbfe8f6f18da200ca274c6d5ca8ca
GIT binary patch
literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4yynF4yyr<?8N*4000McNliru+zJB*77Kpr(N+Ke1La9X
zK~z|U?UYMsT~!o@zkT-J=W)|EHBCfCQ7mc)LZcvJRS>0uSc+JkII1rYk%(}`fjV<$
zoMaRSh89{=u(hRF94QJuz)2G)g3*E2Xxp2co7{7Ap8Me-NwKur2Z9Lq8y?R7*V_O7
z*MdHM`uv|cG{1k_#LTz?xNBhhRcQoQdf=sPF92}(^uc#}y_Fxd*7bp3J~(!AW%jBX
z5La_(`nP@WDyf?7&LW!!2dT=6<+S^q_x{DP(dPG8qIKC0JT~+w0EbT>d`?N#tm=wJ
zoM5dbFLR<Wyr+>gW+!IGZ@iKQF57{lXQ#ug$j3t+z5)ni4bC~rvI3ws6~jZrzTH_A
zMOo~4b^Ghzdi=lBz>zZ_4jXG)-g~stIOnj=qNJj%O4^-81cJeho6w>5t%ZdGxNU5-
zIe#hbOFqHT*7Q!G6^Otqsc_B#pp~XJHP%=faf2jIkV?|&bOaCs-vET@f7HLI15Xa`
z=HrFq9BobS==D~<)}i)VX#wDzBM1VDq96=IYEx4bB>+lFmb%O9GF}KFy!W?{jW*{l
ztARbkPjF=67yyUn_kX3Nx<AV@pCpN}&f>jaE2OZ_A_K|7VjHbANfNV?WyE2`Qg@j+
ziU533mP-gu;&~I8edF%8^W5bZHn4lk;~a0FU}|pirzDBDYNhesQ&uHW7!d>kwW(23
z;k_sA_0URDRuuyS4f4Do3^iJ7&YV39Kp2J?V{p#-wOXIwdh;zicU|+8Tdy0y>T)^W
zKEX$S9608j+p44jz*s{Z#W?TCvJCG%LI{KqL{UhRB!pU1S2alz<E*19E0mNVpsFi^
z)&B(ol#~zuI)BPe%#1&Co&ysz<Ko(pktwb8-n_{1&Lfp1iDHbkC@FDk_OFK!psY%&
zss<oQV(O|!2tjQOy_Ft85D;pOQktU7!9yG;-k4exWjQrA+I(J3%}w5+m3q3a>Rr}a
zqA)@T;k#)nqA<dF2S}WA=Wf5A1!o;vDQaU#(-eR>icwM$MImKXfe;i$j#7%ED#`Lp
z1Va261i_~lgm7YJeDe+0UBAaz^Q;Wyz02LM+OT1OEXzrfcr^!gO%z60XEDZ{b4v)Z
zx*v>12!ReYi=9Q3(gY&#&O2f1x<K&W%Xhx^)<vh_uVLKx^ZPf&ar|JG<=ssiH|{CR
zaxXw$6ogt6#Sv-R17KjFv1<L=bCgv@R;*4$5J;S}pBQ7lG}cazjW&CKJBAnIk->-f
zZ261xzD><d-q&a(Rj;@5`<9`hUYe#47;9Bg=8S9^Nm~o8*+9z8#+bHqE*%?fUV10@
e>C>mrf5o3h!soUY$<5#Z0000<MNUMnLSTYFrwA(m

literal 0
HcmV?d00001

diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua
index 759d8ed..3965258 100644
--- a/technic_worldgen/crafts.lua
+++ b/technic_worldgen/crafts.lua
@@ -1,11 +1,19 @@
 
 local S = technic.worldgen.gettext
 
-minetest.register_craftitem(":technic:uranium", {
-	description = S("Uranium"),
-	inventory_image = "technic_uranium.png",
+minetest.register_craftitem(":technic:uranium_lump", {
+	description = S("Uranium Lump"),
+	inventory_image = "technic_uranium_lump.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
+minetest.register_alias("technic:uranium", "technic:uranium_lump")
+
+minetest.register_craftitem(":technic:uranium_ingot", {
+	description = S("Uranium Ingot"),
+	inventory_image = "technic_uranium_ingot.png",
+	on_place_on_ground = minetest.craftitem_place_item,
+	groups = {uranium_ingot=1},
+})
 
 minetest.register_craftitem(":technic:chromium_lump", {
 	description = S("Chromium Lump"),
@@ -74,7 +82,7 @@ local function register_block(block, ingot)
 	})
 end
 
-register_block("technic:uranium_block", "technic:uranium")
+register_block("technic:uranium_block", "technic:uranium_ingot")
 register_block("technic:chromium_block", "technic:chromium_ingot")
 register_block("technic:zinc_block", "technic:zinc_ingot")
 register_block("technic:brass_block", "technic:brass_ingot")
@@ -94,6 +102,12 @@ minetest.register_craft({
 	output = "technic:chromium_ingot",
 })
 
+minetest.register_craft({
+	type = 'cooking',
+	recipe = "technic:uranium_lump",
+	output = "technic:uranium_ingot",
+})
+
 minetest.register_craft({
 	type = 'cooking',
 	recipe = minetest.registered_aliases["technic:wrought_iron_ingot"],
diff --git a/technic_worldgen/locale/de.txt b/technic_worldgen/locale/de.txt
index 1dacb41..401c94c 100644
--- a/technic_worldgen/locale/de.txt
+++ b/technic_worldgen/locale/de.txt
@@ -3,7 +3,8 @@
 # by Xanthin
 
 ## crafts.lua
-Uranium = Uran
+Uranium Lump = Uranklumpen
+Uranium Ingot = Uranbarren
 Chromium Lump = Chromklumpen
 Chromium Ingot = Chrombarren
 Zinc Lump = Zinkklumpen
diff --git a/technic_worldgen/locale/template.txt b/technic_worldgen/locale/template.txt
index a4a6e4d..594e0ce 100644
--- a/technic_worldgen/locale/template.txt
+++ b/technic_worldgen/locale/template.txt
@@ -2,7 +2,8 @@
 # technic_worldgen translation template
 
 ###crafts.lua
-Uranium = 
+Uranium Lump = 
+Uranium Ingot = 
 Chromium Lump = 
 Chromium Ingot = 
 Zinc Lump = 
diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua
index 29ea5fb..20cf159 100644
--- a/technic_worldgen/nodes.lua
+++ b/technic_worldgen/nodes.lua
@@ -7,7 +7,7 @@ minetest.register_node( ":technic:mineral_uranium", {
 	is_ground_content = true,
 	groups = {cracky=3, radioactive=1},
 	sounds = default.node_sound_stone_defaults(),
-	drop = 'craft "technic:uranium" 1',
+	drop = 'craft "technic:uranium_lump" 1',
 }) 
 
 minetest.register_node( ":technic:mineral_chromium", {
@@ -56,7 +56,7 @@ minetest.register_node(":technic:uranium_block", {
 	description = S("Uranium Block"),
 	tiles = { "technic_uranium_block.png" },
 	is_ground_content = true,
-	groups = {cracky=1, level=2, radioactive=3},
+	groups = {uranium_block=1, cracky=1, level=2, radioactive=3},
 	sounds = default.node_sound_stone_defaults()
 })
 
diff --git a/technic_worldgen/textures/technic_uranium_ingot.png b/technic_worldgen/textures/technic_uranium_ingot.png
new file mode 100644
index 0000000000000000000000000000000000000000..38978f861d7d7cc7be26ecd68eda1cca1064ba77
GIT binary patch
literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002<Nkl<ZIE~$q
z%}&BV7)1}2(22%`szBAmR02L3D;}t;zF7$rf6^9{f+U)Da5^lEkkV1sdbg8vzB?EG
zM1s)QLFjAKTjLlAFu3mnFq_X&rD8N3?>M925UfPQB$@&+8jc%HBk1*w>Nrg(%M$PQ
zj_Boa-=G2-y2WV%K*zZPKyD<tEXY<%b`2i90Z+*@mSu6>bwNYCsDnx=HtKVKCkTCg
z({&NHpn3A;OS1(4&UxDiW~*g&gIpHmvOu(Kge`C{dxX)1GjaMOSo!Jq1{ZAy0MW8Z
yUQ^sokN5n8xAnRP8m6j?Oc#F@9Ey&?|0G)%hJiCsE2x?P0000<MNUMnLSTY8^?h0Z

literal 0
HcmV?d00001

diff --git a/technic_worldgen/textures/technic_uranium.png b/technic_worldgen/textures/technic_uranium_lump.png
similarity index 100%
rename from technic_worldgen/textures/technic_uranium.png
rename to technic_worldgen/textures/technic_uranium_lump.png

From 60bc80692ba51ad0a7f2391803ee454b18cb7174 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Mon, 28 Jul 2014 13:29:39 +0100
Subject: [PATCH 5/5] Remove a noisy debugging print

---
 technic/machines/register/recipes.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/technic/machines/register/recipes.lua b/technic/machines/register/recipes.lua
index 1aba96b..28a0275 100644
--- a/technic/machines/register/recipes.lua
+++ b/technic/machines/register/recipes.lua
@@ -80,7 +80,6 @@ function technic.get_recipe(typename, items)
 		local new_input = {}
 		for i, stack in ipairs(items) do
 			if stack:get_count() < recipe.input[stack:get_name()] then
-				print(stack:get_name())
 				return nil
 			else
 				new_input[i] = ItemStack(stack)