remove MESE

src/content_craftitem.cpp

@@ -107,7 +107,7 @@ void content_craftitem_init()
 	f->texture = "lump_of_iron.png";
 	f->name = "lump_of_iron";
 	f->description = wgettext("Iron Lump");
-	f->cook_result = "CraftItem steel_ingot 1";
+	f->cook_result = CONTENT_CRAFTITEM_STEEL_INGOT;
 	lists::add("creative",i);
 	lists::add("cooking",i);
 
@@ -117,7 +117,7 @@ void content_craftitem_init()
 	f->texture = "lump_of_clay.png";
 	f->name = "lump_of_clay";
 	f->description = wgettext("Clay Lump");
-	f->cook_result = "CraftItem clay_brick 1";
+	f->cook_result = CONTENT_CRAFTITEM_CLAY_BRICK;
 	lists::add("creative",i);
 	lists::add("cooking",i);
 
@@ -127,7 +127,7 @@ void content_craftitem_init()
 	f->texture = "lump_of_tin.png";
 	f->name = "lump_of_tin";
 	f->description = wgettext("Tin Lump");
-	f->cook_result = "CraftItem tin_ingot 1";
+	f->cook_result = CONTENT_CRAFTITEM_TIN_INGOT;
 	lists::add("creative",i);
 	lists::add("cooking",i);
 
@@ -137,7 +137,7 @@ void content_craftitem_init()
 	f->texture = "lump_of_copper.png";
 	f->name = "lump_of_copper";
 	f->description = wgettext("Copper Lump");
-	f->cook_result = "CraftItem copper_ingot 1";
+	f->cook_result = CONTENT_CRAFTITEM_COPPER_INGOT;
 	lists::add("creative",i);
 	lists::add("cooking",i);
 
@@ -147,7 +147,7 @@ void content_craftitem_init()
 	f->texture = "lump_of_silver.png";
 	f->name = "lump_of_silver";
 	f->description = wgettext("Silver Lump");
-	f->cook_result = "CraftItem silver_ingot 1";
+	f->cook_result = CONTENT_CRAFTITEM_SILVER_INGOT;
 	lists::add("creative",i);
 	lists::add("cooking",i);
 
@@ -157,7 +157,7 @@ void content_craftitem_init()
 	f->texture = "lump_of_gold.png";
 	f->name = "lump_of_gold";
 	f->description = wgettext("Gold Lump");
-	f->cook_result = "CraftItem gold_ingot 1";
+	f->cook_result = CONTENT_CRAFTITEM_GOLD_INGOT;
 	lists::add("creative",i);
 	lists::add("cooking",i);
 
@@ -231,7 +231,7 @@ void content_craftitem_init()
 	f->texture = "rat.png";
 	f->name = "rat";
 	f->description = wgettext("Rat");
-	f->cook_result = "CraftItem cooked_rat 1";
+	f->cook_result = CONTENT_CRAFTITEM_COOKED_RAT;
 	f->drop_count = 1;
 	f->drop_item = CONTENT_MOB_RAT;
 	lists::add("creative",i);
@@ -243,7 +243,7 @@ void content_craftitem_init()
 	f->texture = "cooked_rat.png";
 	f->name = "cooked_rat";
 	f->description = wgettext("Cooked Rat");
-	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
+	f->cook_result = CONTENT_CRAFTITEM_ASH;
 	f->consumable = true;
 	f->sound_use = "use-eat";
 	f->hunger_effect = 8;
@@ -521,7 +521,7 @@ void content_craftitem_init()
 	f->content = CONTENT_CRAFTITEM_MUSH;
 	f->texture = "mush.png";
 	f->name = "mush";
-	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
+	f->cook_result = CONTENT_CRAFTITEM_ASH;
 	f->description = wgettext("Mush");
 	f->consumable = true;
 	f->sound_use = "use-eat";
@@ -612,7 +612,7 @@ void content_craftitem_init()
 	f->texture = "dough.png";
 	f->name = "dough";
 	f->description = wgettext("Dough");
-	f->cook_result = std::string("CraftItem bread 1");
+	f->cook_result = CONTENT_CRAFTITEM_BREAD;
 	f->consumable = true;
 	f->sound_use = "use-eat";
 	f->hunger_effect = 4;
@@ -640,7 +640,7 @@ void content_craftitem_init()
 	f->texture = "harvested_potato.png";
 	f->name = "harvested_potato";
 	f->description = wgettext("Potato");
-	f->cook_result = std::string("CraftItem roast_potato 1");
+	f->cook_result = CONTENT_CRAFTITEM_ROASTPOTATO;
 	f->consumable = true;
 	f->sound_use = "use-eat";
 	f->hunger_effect = 6;
@@ -688,7 +688,7 @@ void content_craftitem_init()
 	f->texture = "carrot_cake_raw.png";
 	f->name = "carrot_cake_raw";
 	f->description = wgettext("Raw Carrot Cake");
-	f->cook_result = std::string("CraftItem carrot_cake 1");
+	f->cook_result = CONTENT_CRAFTITEM_CARROT_CAKE;
 	f->consumable = true;
 	f->sound_use = "use-eat";
 	f->hunger_effect = 6;
@@ -743,15 +743,15 @@ void content_craftitem_init()
 	lists::add("craftguide",i);
 	lists::add("creative",i);
 
-	i = CONTENT_CRAFTITEM_MESEDUST;
+	i = CONTENT_CRAFTITEM_MITHRILDUST;
 	f = &g_content_craftitem_features[i];
-	f->content = CONTENT_CRAFTITEM_MESEDUST;
+	f->content = CONTENT_CRAFTITEM_MITHRILDUST;
 	f->texture = "mese_dust.png";
 	f->name = "mese_dust";
-	f->description = wgettext("Mese Dust");
+	f->description = wgettext("Mithril Dust");
 	f->drop_count = 1;
-	f->drop_item = CONTENT_CIRCUIT_MESEWIRE;
-	crafting::set1To2Recipe(CONTENT_MESE,CONTENT_CRAFTITEM_MESEDUST);
+	f->drop_item = CONTENT_CIRCUIT_MITHRILWIRE;
+	crafting::set1To2Recipe(CONTENT_CRAFTITEM_MITHRIL_RAW,CONTENT_CRAFTITEM_MITHRILDUST);
 	lists::add("craftguide",i);
 	lists::add("creative",i);
 
@@ -781,7 +781,7 @@ void content_craftitem_init()
 	f->texture = "fish.png";
 	f->name = "fish";
 	f->description = wgettext("Fish");
-	f->cook_result = "CraftItem cooked_fish 1";
+	f->cook_result = CONTENT_CRAFTITEM_COOKED_FISH;
 	f->drop_count = 1;
 	f->drop_item = CONTENT_MOB_FISH;
 	f->consumable = true;
@@ -797,7 +797,7 @@ void content_craftitem_init()
 	f->texture = "cooked_fish.png";
 	f->name = "cooked_fish";
 	f->description = wgettext("Cooked Fish");
-	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
+	f->cook_result = CONTENT_CRAFTITEM_ASH;
 	f->consumable = true;
 	f->sound_use = "use-eat";
 	f->hunger_effect = 8;
@@ -811,7 +811,7 @@ void content_craftitem_init()
 	f->texture = "meat.png";
 	f->name = "meat";
 	f->description = wgettext("Meat");
-	f->cook_result = "CraftItem cooked_meat 1";
+	f->cook_result = CONTENT_CRAFTITEM_COOKED_MEAT;
 	f->consumable = true;
 	f->sound_use = "use-eat";
 	f->hunger_effect = 1;
@@ -825,7 +825,7 @@ void content_craftitem_init()
 	f->texture = "cooked_meat.png";
 	f->name = "cooked_meat";
 	f->description = wgettext("Cooked Meat");
-	f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
+	f->cook_result = CONTENT_CRAFTITEM_ASH;
 	f->consumable = true;
 	f->sound_use = "use-eat";
 	f->hunger_effect = 10;
@@ -1487,4 +1487,31 @@ void content_craftitem_init()
 	f->cold_effect = 5;
 	f->onuse_replace_item = CONTENT_CRAFTITEM_STEEL_BOTTLE;
 	lists::add("creative",i);
+
+	i = CONTENT_CRAFTITEM_MITHRIL_RAW;
+	f = &g_content_craftitem_features[i];
+	f->content = CONTENT_CRAFTITEM_MITHRIL_RAW;
+	f->texture = "mithril_raw.png";
+	f->name = "mithril_raw";
+	f->description = wgettext("Raw Mithril");
+	f->cook_result = CONTENT_CRAFTITEM_MITHRIL_UNBOUND;
+	lists::add("creative",i);
+	lists::add("cooking",i);
+
+	i = CONTENT_CRAFTITEM_MITHRIL_UNBOUND;
+	f = &g_content_craftitem_features[i];
+	f->content = CONTENT_CRAFTITEM_MITHRIL_UNBOUND;
+	f->texture = "mithril_unbound.png";
+	f->name = "mithril_unbound";
+	f->enchanted_item = CONTENT_CRAFTITEM_MITHRIL;
+	f->description = wgettext("Unbound Mithril");
+	lists::add("creative",i);
+
+	i = CONTENT_CRAFTITEM_MITHRIL;
+	f = &g_content_craftitem_features[i];
+	f->content = CONTENT_CRAFTITEM_MITHRIL;
+	f->texture = "mithril_unbound.png";
+	f->name = "mithril_bound";
+	f->description = wgettext("Mithril");
+	lists::add("creative",i);
 }

src/content_craftitem.h

@@ -35,7 +35,7 @@ struct CraftItemFeatures {
 	// tooltip used in inventory
 	std::wstring description;
 	// the result of cooking this item
-	std::string cook_result;
+	content_t cook_result;
 	// the fuel value of this item
 	float fuel_time;
 	// whether the item can be stacked in inventory
@@ -65,6 +65,8 @@ struct CraftItemFeatures {
 	content_t shot_item;
 	// when the item is Used, it should be replaced with this
 	content_t onuse_replace_item;
+	// if the item can be enchanted, it gives this
+	content_t enchanted_item;
 	// sound played when item is used
 	std::string sound_use;
 
@@ -73,7 +75,7 @@ struct CraftItemFeatures {
 		texture("unknown_item.png"),
 		name(""),
 		description(L""),
-		cook_result(""),
+		cook_result(CONTENT_IGNORE),
 		fuel_time(0.0),
 		stackable(true),
 		consumable(false),
@@ -87,6 +89,7 @@ struct CraftItemFeatures {
 		thrown_item(CONTENT_IGNORE),
 		shot_item(CONTENT_IGNORE),
 		onuse_replace_item(CONTENT_IGNORE),
+		enchanted_item(CONTENT_IGNORE),
 		sound_use("")
 	{}
 };
@@ -155,7 +158,7 @@ CraftItemFeatures & content_craftitem_features(std::string subname);
 #define CONTENT_CRAFTITEM_BEETROOT (CONTENT_CRAFTITEM_MASK | 0x3F)
 #define CONTENT_CRAFTITEM_GRAPE (CONTENT_CRAFTITEM_MASK | 0x40)
 #define CONTENT_CRAFTITEM_STRING (CONTENT_CRAFTITEM_MASK | 0x41)
-#define CONTENT_CRAFTITEM_MESEDUST (CONTENT_CRAFTITEM_MASK | 0x42)
+#define CONTENT_CRAFTITEM_MITHRILDUST (CONTENT_CRAFTITEM_MASK | 0x42)
 #define CONTENT_CRAFTITEM_RESIN (CONTENT_CRAFTITEM_MASK | 0x43)
 #define CONTENT_CRAFTITEM_OERKKI_DUST (CONTENT_CRAFTITEM_MASK | 0x44)
 #define CONTENT_CRAFTITEM_FISH (CONTENT_CRAFTITEM_MASK | 0x45)
@@ -216,5 +219,8 @@ CraftItemFeatures & content_craftitem_features(std::string subname);
 #define CONTENT_CRAFTITEM_STEEL_BOTTLE (CONTENT_CRAFTITEM_MASK | 0x7C)
 #define CONTENT_CRAFTITEM_STEEL_BOTTLE_WATER (CONTENT_CRAFTITEM_MASK | 0x7D)
 #define CONTENT_CRAFTITEM_GLASS_BOTTLE_WATER (CONTENT_CRAFTITEM_MASK | 0x7E)
+#define CONTENT_CRAFTITEM_MITHRIL_RAW (CONTENT_CRAFTITEM_MASK | 0x7F)
+#define CONTENT_CRAFTITEM_MITHRIL_UNBOUND (CONTENT_CRAFTITEM_MASK | 0x80)
+#define CONTENT_CRAFTITEM_MITHRIL (CONTENT_CRAFTITEM_MASK | 0x81)
 
 #endif

src/content_mapnode.cpp

@@ -36,6 +36,7 @@
 #include "content_list.h"
 #include "content_nodebox.h"
 #include "content_mapnode_util.h"
+#include "mineral.h"
 #ifndef SERVER
 #include "tile.h"
 #endif
@@ -240,6 +241,10 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version)
 		result.setContent(CONTENT_FARM_TRELLIS_GRAPE);
 		result.param2 = 12;
 		break;
+	case CONTENT_MESE:
+		result.setContent(CONTENT_STONE);
+		result.param1 = MINERAL_MITHRIL;
+		break;
 	default:;
 	}
 	return result;
@@ -1334,34 +1339,6 @@ void content_mapnode_init(bool repeat)
 	lists::add("craftguide",i);
 	lists::add("creative",i);
 
-	i = CONTENT_MESE;
-	f = &content_features(i);
-	f->description = wgettext("Mese");
-	f->setAllTextures("mese.png");
-	f->setInventoryTextureCube("mese.png", "mese.png", "mese.png");
-	f->draw_type = CDT_CUBELIKE;
-	f->is_ground_content = true;
-	f->onpunch_replace_node = CONTENT_MESE_DIGGING;
-	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
-	f->cook_result = std::string("CraftItem saltpeter 1");
-	f->type = CMT_STONE;
-	f->hardness = 0.5;
-	lists::add("creative",i);
-	lists::add("cooking",i);
-
-	i = CONTENT_MESE_DIGGING;
-	f = &content_features(i);
-	f->description = wgettext("Mese");
-	f->setAllTextures("mese.png");
-	f->setInventoryTextureCube("mese.png", "mese.png", "mese.png");
-	f->param_type = CPT_LIGHT;
-	f->draw_type = CDT_CUBELIKE;
-	f->is_ground_content = true;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MESE)+" 1";
-	f->light_source = 10;
-	f->type = CMT_STONE;
-	f->hardness = 0.5;
-
 	i = CONTENT_SPONGE;
 	f = &content_features(i);
 	f->description = wgettext("Sponge");

src/content_mapnode.h

@@ -96,6 +96,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 #define CONTENT_TREE 0x801
 #define CONTENT_LEAVES 0x802
 #define CONTENT_FARM_DIRT 0x803
+// MESE is deprecated, but leave it here for the moment
 #define CONTENT_MESE 0x804
 #define CONTENT_MUD 0x805
 #define CONTENT_COTTON 0x806
@@ -267,6 +268,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 #define CONTENT_FIRE_SHORTTERM 0x8C7
 #define CONTENT_TNT 0x8C8
 #define CONTENT_FLASH 0x8C9
+// MESE is deprecated, but leave it here for the moment
 #define CONTENT_MESE_DIGGING 0x8CA
 #define CONTENT_COBBLE 0x8CB
 #define CONTENT_ROUGHSTONEBRICK 0x8CC
@@ -581,7 +583,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 
 // circuits
 // circuits - wire
-#define CONTENT_CIRCUIT_MESEWIRE 0xF00
+#define CONTENT_CIRCUIT_MITHRILWIRE 0xF00
 #define CONTENT_CIRCUIT_COPPERWIRE 0xF01
 // circuits - powersource
 #define CONTENT_CIRCUIT_REACTOR 0xF20

src/content_mapnode_circuit.cpp

@@ -31,10 +31,10 @@ void content_mapnode_circuit(bool repeat)
 	content_t i;
 	ContentFeatures *f = NULL;
 
-	i = CONTENT_CIRCUIT_MESEWIRE;
+	i = CONTENT_CIRCUIT_MITHRILWIRE;
 	f = &content_features(i);
-	f->description = wgettext("Mese Wire");
-	f->setAllTextures("mese_wire.png");
+	f->description = wgettext("Mithril Wire");
+	f->setAllTextures("mithril_wire.png");
 	f->setAllTextureFlags(0);
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_WIRELIKE;
@@ -44,7 +44,7 @@ void content_mapnode_circuit(bool repeat)
 	f->sunlight_propagates = true;
 	f->air_equivalent = true; // grass grows underneath
 	f->solidness = 0; // drawn separately, makes no faces
-	f->dug_item = std::string("CraftItem mese_dust 1");
+	f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_MITHRILDUST)+" 1";
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
@@ -106,7 +106,7 @@ void content_mapnode_circuit(bool repeat)
 	f->setInventoryTextureNodeBox(i,"circuit_reactor_top.png","circuit_reactor.png","circuit_reactor.png");
 	if (f->initial_metadata == NULL)
 		f->initial_metadata = new SourceNodeMetadata();
-	crafting::set1over1Recipe(CONTENT_CRAFTITEM_QUARTZ,CONTENT_MESE,CONTENT_CIRCUIT_REACTOR);
+	crafting::setFilledRoundRecipe(CONTENT_CRAFTITEM_MITHRIL_UNBOUND,CONTENT_CRAFTITEM_QUARTZ,CONTENT_CIRCUIT_REACTOR);
 	lists::add("craftguide",i);
 	lists::add("creative",i);
 
@@ -133,7 +133,7 @@ void content_mapnode_circuit(bool repeat)
 	{
 		u16 r[9] = {
 			CONTENT_GLASS,			CONTENT_GLASS,			CONTENT_GLASS,
-			CONTENT_CRAFTITEM_QUARTZ_DUST,	CONTENT_CRAFTITEM_MESEDUST,	CONTENT_CRAFTITEM_QUARTZ_DUST,
+			CONTENT_CRAFTITEM_QUARTZ_DUST,	CONTENT_CRAFTITEM_MITHRILDUST,	CONTENT_CRAFTITEM_QUARTZ_DUST,
 			CONTENT_WOOD_SLAB,		CONTENT_WOOD_SLAB,		CONTENT_WOOD_SLAB
 		};
 		crafting::setRecipe(r,CONTENT_CIRCUIT_SOLARPANEL,1);
@@ -166,7 +166,7 @@ void content_mapnode_circuit(bool repeat)
 	{
 		u16 r[9] = {
 			CONTENT_STONE,			CONTENT_WOOD_SLAB,		CONTENT_STONE,
-			CONTENT_CRAFTITEM_MESEDUST,	CONTENT_CRAFTITEM_STEEL_INGOT,	CONTENT_CRAFTITEM_QUARTZ_DUST,
+			CONTENT_CRAFTITEM_MITHRILDUST,	CONTENT_CRAFTITEM_STEEL_INGOT,	CONTENT_CRAFTITEM_QUARTZ_DUST,
 			CONTENT_STONE,			CONTENT_WOOD_SLAB,		CONTENT_STONE
 		};
 		crafting::setRecipe(r,CONTENT_CIRCUIT_WATERWHEEL,1);
@@ -201,7 +201,7 @@ void content_mapnode_circuit(bool repeat)
 		f->initial_metadata = new SwitchNodeMetadata();
 	{
 		u16 recipe[9] = {
-			CONTENT_IGNORE, CONTENT_CRAFTITEM_MESEDUST, CONTENT_IGNORE,
+			CONTENT_IGNORE, CONTENT_CRAFTITEM_MITHRILDUST, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_STONE, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_CRAFTITEM_QUARTZ_DUST, CONTENT_IGNORE
 		};
@@ -233,7 +233,7 @@ void content_mapnode_circuit(bool repeat)
 		f->initial_metadata = new ButtonNodeMetadata();
 	{
 		u16 recipe[9] = {
-			CONTENT_IGNORE, CONTENT_CRAFTITEM_MESEDUST, CONTENT_IGNORE,
+			CONTENT_IGNORE, CONTENT_CRAFTITEM_MITHRILDUST, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_STONE_KNOB, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_CRAFTITEM_QUARTZ_DUST, CONTENT_IGNORE
 		};
@@ -262,7 +262,7 @@ void content_mapnode_circuit(bool repeat)
 		f->initial_metadata = new ButtonNodeMetadata();
 	{
 		u16 recipe[9] = {
-			CONTENT_IGNORE, CONTENT_CRAFTITEM_MESEDUST, CONTENT_IGNORE,
+			CONTENT_IGNORE, CONTENT_CRAFTITEM_MITHRILDUST, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_STONE_SLAB, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_CRAFTITEM_QUARTZ_DUST, CONTENT_IGNORE
 		};
@@ -291,7 +291,7 @@ void content_mapnode_circuit(bool repeat)
 		f->initial_metadata = new ButtonNodeMetadata();
 	{
 		u16 recipe[9] = {
-			CONTENT_IGNORE, CONTENT_CRAFTITEM_MESEDUST, CONTENT_IGNORE,
+			CONTENT_IGNORE, CONTENT_CRAFTITEM_MITHRILDUST, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_WOOD_SLAB, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_CRAFTITEM_QUARTZ_DUST, CONTENT_IGNORE
 		};
@@ -323,7 +323,7 @@ void content_mapnode_circuit(bool repeat)
 		f->initial_metadata = new NotGateNodeMetadata();
 	{
 		u16 recipe[9] = {
-			CONTENT_IGNORE, CONTENT_CRAFTITEM_MESEDUST, CONTENT_IGNORE,
+			CONTENT_IGNORE, CONTENT_CRAFTITEM_MITHRILDUST, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_STONE, CONTENT_IGNORE,
 			CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE
 		};
@@ -356,7 +356,7 @@ void content_mapnode_circuit(bool repeat)
 	{
 		u16 recipe[9] = {
 			CONTENT_IGNORE,			CONTENT_IGNORE,	CONTENT_IGNORE,
-			CONTENT_CRAFTITEM_MESEDUST,	CONTENT_STONE,	CONTENT_CRAFTITEM_MESEDUST,
+			CONTENT_CRAFTITEM_MITHRILDUST,	CONTENT_STONE,	CONTENT_CRAFTITEM_MITHRILDUST,
 			CONTENT_IGNORE,			CONTENT_IGNORE,	CONTENT_IGNORE
 		};
 		crafting::setRecipe(recipe,CONTENT_CIRCUIT_REPEATER,1);
@@ -449,7 +449,7 @@ void content_mapnode_circuit(bool repeat)
 	{
 		u16 recipe[9] = {
 			CONTENT_WOOD,	CONTENT_ROUGHSTONE,		CONTENT_ROUGHSTONE,
-			CONTENT_WOOD,	CONTENT_CRAFTITEM_STEEL_INGOT,	CONTENT_CRAFTITEM_MESEDUST,
+			CONTENT_WOOD,	CONTENT_CRAFTITEM_STEEL_INGOT,	CONTENT_CRAFTITEM_MITHRILDUST,
 			CONTENT_WOOD,	CONTENT_ROUGHSTONE,		CONTENT_ROUGHSTONE
 		};
 		crafting::setRecipe(recipe,CONTENT_CIRCUIT_PISTON_OFF,1);

src/content_mapnode_furniture.cpp

@@ -1810,7 +1810,7 @@ void content_mapnode_furniture(bool repeat)
 	{
 		u16 r[9] = {
 			CONTENT_CRAFTITEM_PINE_PLANK,	CONTENT_CRAFTITEM_PINE_PLANK,	CONTENT_CRAFTITEM_PINE_PLANK,
-			CONTENT_CRAFTITEM_PINE_PLANK,	CONTENT_CRAFTITEM_MESEDUST,	CONTENT_CRAFTITEM_PINE_PLANK,
+			CONTENT_CRAFTITEM_PINE_PLANK,	CONTENT_CRAFTITEM_MITHRILDUST,	CONTENT_CRAFTITEM_PINE_PLANK,
 			CONTENT_CRAFTITEM_PINE_PLANK,	CONTENT_CRAFTITEM_PINE_PLANK,	CONTENT_CRAFTITEM_PINE_PLANK
 		};
 		crafting::setRecipe(r,CONTENT_CLOCK,1);

src/content_mapnode_special.cpp

@@ -620,7 +620,8 @@ void content_mapnode_special(bool repeat)
 	f->type = CMT_STONE;
 	f->hardness = 2.0;
 	f->pressure_type = CST_SOLID;
-	crafting::setFilledRoundRecipe(CONTENT_STONE,CONTENT_MESE,CONTENT_BORDERSTONE);
+	crafting::setFilledRoundRecipe(CONTENT_STONE,CONTENT_CRAFTITEM_MITHRIL_RAW,CONTENT_BORDERSTONE);
+	crafting::setFilledRoundRecipe(CONTENT_STONE,CONTENT_CRAFTITEM_MITHRIL_UNBOUND,CONTENT_BORDERSTONE);
 	{
 		u16 r[9] = {
 			CONTENT_CRAFTITEM_STEEL_INGOT,	CONTENT_STONE,			CONTENT_CRAFTITEM_STEEL_INGOT,
@@ -785,7 +786,8 @@ void content_mapnode_special(bool repeat)
 	f->hardness = 1.0;
 	f->pressure_type = CST_CRUSHABLE;
 	f->suffocation_per_second = 0;
-	crafting::set1Any2Recipe(CONTENT_BOOK,CONTENT_MESE,i);
+	crafting::set1Any2Recipe(CONTENT_BOOK,CONTENT_CRAFTITEM_MITHRIL_RAW,i);
+	crafting::set1Any2Recipe(CONTENT_BOOK,CONTENT_CRAFTITEM_MITHRIL_UNBOUND,i);
 	{
 		content_t r[9] = {
 			CONTENT_CRAFTITEM_STICK, CONTENT_CRAFTITEM_STICK, CONTENT_IGNORE,
@@ -1477,7 +1479,7 @@ void content_mapnode_special(bool repeat)
 	f->type = CMT_STONE;
 	f->hardness = 0.4;
 	f->pressure_type = CST_SOLID;
-	crafting::setFilledRoundRecipe(CONTENT_ROUGHSTONE,CONTENT_MESE,CONTENT_INCINERATOR);
+	crafting::setFilledRoundRecipe(CONTENT_ROUGHSTONE,CONTENT_CRAFTITEM_MITHRIL_UNBOUND,CONTENT_INCINERATOR);
 	lists::add("craftguide",i);
 	lists::add("creative",i);
 
@@ -1980,7 +1982,14 @@ void content_mapnode_special(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->suffocation_per_second = 0;
-	crafting::set1over1Recipe(CONTENT_SPONGE,CONTENT_MESE,CONTENT_LIFE_SUPPORT);
+	{
+		content_t r[9] = {
+			CONTENT_IGNORE,				CONTENT_SPONGE,				CONTENT_IGNORE,
+			CONTENT_CRAFTITEM_MITHRIL_UNBOUND,	CONTENT_IGNORE,				CONTENT_CRAFTITEM_MITHRIL_UNBOUND,
+			CONTENT_CRAFTITEM_MITHRIL_UNBOUND,	CONTENT_CRAFTITEM_MITHRIL_UNBOUND,	CONTENT_CRAFTITEM_MITHRIL_UNBOUND
+		};
+		crafting::setRecipe(r,CONTENT_LIFE_SUPPORT,1);
+	}
 	lists::add("craftguide",i);
 	lists::add("creative",i);
 

src/content_nodemeta.cpp

@@ -2885,7 +2885,7 @@ CircuitNodeMetadata::~CircuitNodeMetadata()
 }
 u16 CircuitNodeMetadata::typeId() const
 {
-	return CONTENT_CIRCUIT_MESEWIRE;
+	return CONTENT_CIRCUIT_MITHRILWIRE;
 }
 NodeMetadata* CircuitNodeMetadata::create(std::istream &is)
 {

src/content_toolitem.cpp

@@ -172,19 +172,17 @@ void content_toolitem_init()
 	lists::add("craftguide",i);
 	lists::add("creative",i);
 
-	i = CONTENT_TOOLITEM_MESEPICK;
+	i = CONTENT_TOOLITEM_CREATIVEPICK;
 	f = &g_content_toolitem_features[i];
 	f->content = i;
-	f->texture = "tool_mesepick.png";
+	f->texture = "tool_creativepick.png";
 	f->name = "MesePick";
-	f->description = wgettext("Mese Pick");
+	f->description = wgettext("Creative Pick");
 	f->type = TT_PICK;
-	f->hardness = 1337.;
+	f->hardness = 1000.;
 	f->dig_time = 0.;
 	f->level = 4;
 	f->has_punch_effect = false;
-	crafting::setPickRecipe(CONTENT_MESE,CONTENT_TOOLITEM_MESEPICK);
-	lists::add("craftguide",i);
 	lists::add("player-creative",i);
 	lists::add("creative",i);
 

src/content_toolitem.h

@@ -113,7 +113,7 @@ ToolItemFeatures & content_toolitem_features(std::string subname);
 #define CONTENT_TOOLITEM_WPICK (CONTENT_TOOLITEM_MASK | 0x01)
 #define CONTENT_TOOLITEM_STPICK (CONTENT_TOOLITEM_MASK | 0x02)
 #define CONTENT_TOOLITEM_STEELPICK (CONTENT_TOOLITEM_MASK | 0x03)
-#define CONTENT_TOOLITEM_MESEPICK (CONTENT_TOOLITEM_MASK | 0x04)
+#define CONTENT_TOOLITEM_CREATIVEPICK (CONTENT_TOOLITEM_MASK | 0x04)
 #define CONTENT_TOOLITEM_WSHOVEL (CONTENT_TOOLITEM_MASK | 0x05)
 #define CONTENT_TOOLITEM_STSHOVEL (CONTENT_TOOLITEM_MASK | 0x06)
 #define CONTENT_TOOLITEM_STEELSHOVEL (CONTENT_TOOLITEM_MASK | 0x07)

src/environment.cpp

@@ -1722,7 +1722,8 @@ void ServerEnvironment::step(float dtime)
 					break;
 				}
 
-				// mese prettiness
+				// MESE is dead
+				case CONTENT_MESE:
 				case CONTENT_MESE_DIGGING:
 				{
 					v3f pp;
@@ -1731,7 +1732,8 @@ void ServerEnvironment::step(float dtime)
 					pp.Z = p.Z;
 					Player *nearest = getNearestConnectedPlayer(pp);
 					if (nearest == NULL || nearest->getPosition().getDistanceFrom(pp*BS) > 6.0*BS) {
-						n.setContent(CONTENT_MESE);
+						n.setContent(CONTENT_STONE);
+						n.param1 = MINERAL_MITHRIL;
 						m_map->addNodeWithEvent(p, n);
 					}
 					break;

src/inventory.cpp

@@ -268,7 +268,7 @@ std::wstring CraftItem::getGuiText()
 	std::wstring txt(L"  ");
 	CraftItemFeatures *f = &content_craftitem_features(m_content);
 	txt += f->description;
-	if (f->consumable || f->cook_result != "" || f->fuel_time != 0.0)
+	if (f->consumable || f->cook_result != CONTENT_IGNORE || f->fuel_time != 0.0)
 		txt += L"\n";
 	if (f->consumable) {
 		if (f->hunger_effect) {
@@ -302,7 +302,7 @@ std::wstring CraftItem::getGuiText()
 			txt += narrow_to_wide(buff);
 		}
 	}
-	if (f->cook_result != "") {
+	if (f->cook_result != CONTENT_IGNORE) {
 		txt += L"\n";
 		txt += wgettext("Cookable: Yes");
 	}
@@ -345,13 +345,12 @@ u16 CraftItem::getDropCount() const
 
 bool CraftItem::isCookable() const
 {
-	return content_craftitem_features(m_content).cook_result != "";
+	return content_craftitem_features(m_content).cook_result != CONTENT_IGNORE;
 }
 
 InventoryItem *CraftItem::createCookResult() const
 {
-	std::istringstream is(content_craftitem_features(m_content).cook_result, std::ios::binary);
-	return InventoryItem::deSerialize(is);
+	return InventoryItem::create(content_craftitem_features(m_content).cook_result,1,1,0);
 }
 
 bool CraftItem::isFuel() const

src/mapgen.cpp

@@ -1497,8 +1497,9 @@ void make_block(BlockMakeData *data)
 				for (u16 i=0; i<27; i++) {
 					v3s16 p = v3s16(x,y,z) + g_27dirs[i];
 					u32 vi = vmanip.m_area.index(p);
+					// TODO: at random, some should be gems
 					if (vmanip.m_data[vi].getContent() == base_content && mineralrandom.next()%8 == 0)
-						vmanip.m_data[vi] = MapNode(CONTENT_MESE);
+						vmanip.m_data[vi] = MapNode(base_content,MINERAL_MITHRIL);
 				}
 
 			}

src/mineral.cpp

@@ -107,4 +107,10 @@ void init_mineral()
 	f->texture = "mineral_quartz.png";
 	f->dug_item = CONTENT_CRAFTITEM_QUARTZ;
 	f->min_level = 3;
+
+	i = MINERAL_MITHRIL;
+	f = &mineral_features(i);
+	f->texture = "mineral_mithril.png";
+	f->dug_item = CONTENT_CRAFTITEM_MITHRIL_RAW;
+	f->min_level = 3;
 }

src/mineral.h

@@ -37,6 +37,7 @@
 #define MINERAL_SILVER 5
 #define MINERAL_GOLD 6
 #define MINERAL_QUARTZ 7
+#define MINERAL_MITHRIL 8
 
 struct MineralFeatures {
 	std::string texture;

src/server.cpp

@@ -3840,17 +3840,6 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 				/*
 					Calculate special events
 				*/
-
-				/*if(n.d == CONTENT_MESE)
-				{
-					u32 count = 0;
-					for(s16 z=-1; z<=1; z++)
-					for(s16 y=-1; y<=1; y++)
-					for(s16 x=-1; x<=1; x++)
-					{
-
-					}
-				}*/
 			}else if (wielded_tool_features.onplace_node != CONTENT_IGNORE) {
 				bool replaced_node_exists = false;
 				MapNode replaced_node = m_env.getMap().getNodeNoEx(p_over,&replaced_node_exists);