Move uranium back into technic mod

mods/ITEMS/base/crafting.lua

@@ -420,22 +420,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = 'base:uraniumblock',
-	recipe = {
-		{'base:uranium_ingot', 'base:uranium_ingot', 'base:uranium_ingot'},
-		{'base:uranium_ingot', 'base:uranium_ingot', 'base:uranium_ingot'},
-		{'base:uranium_ingot', 'base:uranium_ingot', 'base:uranium_ingot'},
-	}
-})
-
-minetest.register_craft({
-	output = 'base:uranium_ingot 9',
-	recipe = {
-		{'base:uraniumblock'},
-	}
-})
-
 minetest.register_craft({
 	output = 'base:zincblock',
 	recipe = {
@@ -905,12 +889,6 @@ minetest.register_craft({
 	recipe = "base:gold_lump",
 })
 
-minetest.register_craft({
-	type = "cooking",
-	output = "base:uranium_ingot",
-	recipe = "base:uranium_lump",
-})
-
 minetest.register_craft({
 	type = "cooking",
 	output = "base:zinc_ingot",

mods/ITEMS/base/craftitems.lua

@@ -45,11 +45,6 @@ minetest.register_craftitem("base:gold_lump", {
 	inventory_image = "base_gold_lump.png",
 })
 
-minetest.register_craftitem("base:uranium_lump", {
-	description = "Uranium Lump",
-	inventory_image = "base_uranium_lump.png",
-})
-
 minetest.register_craftitem("base:zinc_lump", {
 	description = "Zinc Lump",
 	inventory_image = "base_zinc_lump.png",
@@ -105,12 +100,6 @@ minetest.register_craftitem("base:gold_ingot", {
 	inventory_image = "base_gold_ingot.png"
 })
 
-minetest.register_craftitem("base:uranium_ingot", {
-	description = "Uranium Ingot",
-	inventory_image = "base_uranium_ingot.png",
-	groups = {uranium_ingot =1},
-})
-
 minetest.register_craftitem("base:zinc_ingot", {
 	description = "Zinc Ingot",
 	inventory_image = "base_zinc_ingot.png",

mods/ITEMS/base/nodes_base.lua

@@ -608,22 +608,6 @@ minetest.register_node("base:bronzeblock", {
 	sounds = base.node_sound_metal_defaults(),
 })
 
-minetest.register_node("base:stone_with_uranium", {
-	description = "Uranium Ore",
-	tiles = {"base_stone.png^base_mineral_uranium.png" },
-	groups = {cracky = 3, radioactive = 1},
-	drop = "base:uranium_lump",
-	sounds = base.node_sound_stone_defaults(),
-}) 
-
-minetest.register_node("base:uraniumblock", {
-	description = "Uranium Block",
-	tiles = {"base_uranium_block.png"},
-	is_ground_content = false,
-	groups = {uranium_block = 1, cracky = 1, level = 2, radioactive = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
 minetest.register_node("base:stone_with_zinc", {
 	description = "Zinc Ore",
 	tiles = {"base_stone.png^base_mineral_zinc.png" },

mods/ITEMS/technic/init.lua

@@ -26,6 +26,9 @@ dofile(modpath.."/config.lua")
 -- Helper functions
 dofile(modpath.."/helpers.lua")
 
+-- Uranium
+dofile(modpath.."/uranium.lua")
+
 -- Items 
 dofile(modpath.."/items.lua")
 

mods/ITEMS/technic/items.lua

@@ -156,16 +156,15 @@ minetest.register_node("technic:machine_casing", {
 })
 
 
--- NEED TO FIX
---[[for p = 0, 35 do
+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 = ":base:uranium"..psuffix.."_ingot"
-	local block = ":base:uranium"..psuffix.."_block"
+	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 = "base_uranium_ingot.png",
+		inventory_image = "technic_uranium_ingot.png",
 		groups = {uranium_ingot=1, not_in_creative_inventory=nici},
 	});
 	-- Note on radioactivity of blocks:
@@ -202,7 +201,7 @@ minetest.register_node("technic:machine_casing", {
 	local radioactivity = math.floor(math.sqrt((1+5.55*p/35) * 18 / (1+5.55*7/35)) + 0.5);
 	(ov or minetest.register_node)(block, {
 		description = string.format(S("%.1f%%-Fissile Uranium Block"), p/10),
-		tiles = {"base_uranium_block.png"},
+		tiles = {"technic_uranium_block.png"},
 		is_ground_content = true,
 		groups = {uranium_block=1, not_in_creative_inventory=nici,
 			cracky=1, level=2, radioactive=radioactivity},
@@ -224,5 +223,3 @@ minetest.register_node("technic:machine_casing", {
 	end
 end
 
---]]
-

mods/ITEMS/technic/radiation.lua

@@ -151,14 +151,14 @@ local rad_resistance_node = {
 	["technic:corium_flowing"] = 40,
 	["technic:corium_source"] = 80,
 	["base:granite"] = 18,
-	["technic:lead_block"] = 80,
-	["technic:marble"] = 18,
+	["base:lead_block"] = 80,
+	["base:marble"] = 18,
 	["technic:marble_bricks"] = 18,
 	["technic:mineral_chromium"] = 19,
-	["technic:mineral_uranium"] = 71,
-	["technic:mineral_zinc"] = 19,
+	["technic:stone_with_uranium"] = 71,
+	["base:mineral_zinc"] = 19,
 	["technic:stainless_steel_block"] = 40,
-	["technic:zinc_block"] = 36,
+	["base:zinc_block"] = 36,
 	["tnt:tnt"] = 11,
 	["tnt:tnt_burning"] = 11,
 }

mods/ITEMS/technic/uranium.lua

@@ -0,0 +1,54 @@
+--[[
+	Uranium
+--]]
+
+
+minetest.register_node("technic:stone_with_uranium", {
+	description = "Uranium Ore",
+	tiles = {"base_stone.png^technic_mineral_uranium.png" },
+	groups = {cracky = 3, radioactive = 1},
+	drop = "technic:uranium_lump",
+	sounds = base.node_sound_stone_defaults(),
+}) 
+
+minetest.register_node("technic:uraniumblock", {
+	description = "Uranium Block",
+	tiles = {"technic_uranium_block.png"},
+	is_ground_content = false,
+	groups = {uranium_block = 1, cracky = 1, level = 2, radioactive = 2},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+minetest.register_craftitem("technic:uranium_lump", {
+	description = "Uranium Lump",
+	inventory_image = "technic_uranium_lump.png",
+})
+
+minetest.register_craftitem("technic:uranium_ingot", {
+	description = "Uranium Ingot",
+	inventory_image = "technic_uranium_ingot.png",
+	groups = {uranium_ingot =1},
+})
+
+minetest.register_craft({
+	output = 'technic:uraniumblock',
+	recipe = {
+		{'technic:uranium_ingot', 'technic:uranium_ingot', 'technic:uranium_ingot'},
+		{'technic:uranium_ingot', 'technic:uranium_ingot', 'technic:uranium_ingot'},
+		{'technic:uranium_ingot', 'technic:uranium_ingot', 'technic:uranium_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'technic:uranium_ingot 9',
+	recipe = {
+		{'technic:uraniumblock'},
+	}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "technic:uranium_ingot",
+	recipe = "technic:uranium_lump",
+})
+

mods/MAPGEN/biomes/central_australia.lua

@@ -54,7 +54,7 @@ minetest.register_ore({
 -- Uranium (Olympic Dam)
 minetest.register_ore({
 	ore_type =         "scatter",
-	ore =              "base:stone_with_uranium",
+	ore =              "technic:stone_with_uranium",
 	wherein =          "base:stone",
 	clust_scarcity =   20 * 20 * 20,
 	clust_num_ores =   6,

mods/MAPGEN/biomes/top_end.lua

@@ -67,7 +67,7 @@ minetest.register_ore({
 -- Uranium (Ranger)
 minetest.register_ore({
 	ore_type =         "scatter",
-	ore =              "base:stone_with_uranium",
+	ore =              "technic:stone_with_uranium",
 	wherein =          {"base:stone"},
 	clust_scarcity =   28 * 28 * 28,
 	clust_num_ores =   4,
@@ -89,7 +89,7 @@ minetest.register_ore({
 -- Uranium (Jabiluka)
 minetest.register_ore({
 	ore_type =         "scatter",
-	ore =              "base:stone_with_uranium",
+	ore =              "technic:stone_with_uranium",
 	wherein =          {"base:stone"},
 	clust_scarcity =   26 * 26 * 26,
 	clust_num_ores =   4,