change CONTENT_CLOUD to CONTENT_COTTON and add craft recipe for it

src/content_craft.cpp

@@ -389,6 +389,19 @@ InventoryItem *craft_get_result(InventoryItem **items)
 		}
 	}
 
+	// Cotton
+	{
+		ItemSpec specs[9];
+		specs[3] = ItemSpec(ITEM_MATERIAL, CONTENT_JUNGLEGRASS);
+		specs[4] = ItemSpec(ITEM_MATERIAL, CONTENT_JUNGLEGRASS);
+		specs[6] = ItemSpec(ITEM_MATERIAL, CONTENT_JUNGLEGRASS);
+		specs[7] = ItemSpec(ITEM_MATERIAL, CONTENT_JUNGLEGRASS);
+		if(checkItemCombination(items, specs))
+		{
+			return new MaterialItem(CONTENT_COTTON, 1);
+		}
+	}
+
 	// Paper
 	{
 		ItemSpec specs[9];
@@ -514,7 +527,7 @@ void craft_set_creative_inventory(Player *player)
 		CONTENT_RAIL,
 		CONTENT_MESE,
 		CONTENT_WATERSOURCE,
-		CONTENT_CLOUD,
+		CONTENT_COTTON,
 		CONTENT_CHEST,
 		CONTENT_FURNACE,
 		CONTENT_SIGN_WALL,

src/content_inventory.cpp

@@ -76,7 +76,7 @@ std::string item_craft_get_image_name(const std::string &subname)
 	else if(subname == "apple_iron")
 		return "apple_iron.png";
 	else
-		return "cloud.png"; // just something
+		return "cotton.png"; // just something
 }
 
 ServerActiveObject* item_craft_create_object(const std::string &subname,

src/content_mapnode.cpp

@@ -49,7 +49,7 @@ content_t trans_table_19[20][2] = {
 	{CONTENT_GRASS_FOOTSTEPS, 6},
 	{CONTENT_MESE, 7},
 	{CONTENT_MUD, 8},
-	{CONTENT_CLOUD, 10},
+	{CONTENT_COTTON, 10},
 	{CONTENT_WOOD, 12},
 	{CONTENT_SAND, 13},
 	{CONTENT_COBBLE, 18},
@@ -358,12 +358,14 @@ void content_mapnode_init()
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	setStoneLikeDiggingProperties(f->digging_properties, 0.5);
 
-	i = CONTENT_CLOUD;
+	i = CONTENT_COTTON;
 	f = &content_features(i);
-	f->setAllTextures("cloud.png");
-	f->setInventoryTextureCube("cloud.png", "cloud.png", "cloud.png");
+	f->setAllTextures("cotton.png");
+	f->setInventoryTextureCube("cotton.png", "cotton.png", "cotton.png");
+	f->param_type = CPT_MINERAL;
 	f->is_ground_content = true;
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	setDirtLikeDiggingProperties(f->digging_properties, 1.0);
 
 	i = CONTENT_AIR;
 	f = &content_features(i);

src/content_mapnode.h

@@ -64,8 +64,8 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 #define CONTENT_GRASS_FOOTSTEPS 0x803 //6
 #define CONTENT_MESE 0x804 //7
 #define CONTENT_MUD 0x805 //8
-// Pretty much useless, clouds won't be drawn this way
-#define CONTENT_CLOUD 0x806 //10
+// used to be cloud
+#define CONTENT_COTTON 0x806 //10
 
 #define CONTENT_WOOD 0x808 //12
 #define CONTENT_SAND 0x809 //13

src/inventory.h

@@ -333,7 +333,7 @@ public:
 		else if(m_toolname == "SteelSword")
 			return "tool_steelsword.png";
 		else
-			return "cloud.png";
+			return "cotton.png";
 }
 
 	video::ITexture * getImage() const